Skip to content

Commit c7c9692

Browse files
avargitster
authored andcommitted
Makefile: remove $(NO_CURL) from $(SCRIPT_DEFINES)
Stop including $(NO_CURL) in $(SCRIPT_DEFINES). The "@NO_CURL@" replacement added in 6c5c62f (Print an error if cloning a http repo and NO_CURL is set, 2006-02-15) has not been referenced by anything in-tree since 49eb8d3 (Remove contrib/examples/*, 2018-03-25). That commit removed the reference from contrib/examples/*, but this @@NO_CURL@@ hasn't been used since git-pull.sh was the primary entry point for "git pull". Signed-off-by: Ævar Arnfjörð Bjarmason <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent ab77294 commit c7c9692

File tree

1 file changed

+1
-2
lines changed

1 file changed

+1
-2
lines changed

Makefile

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2253,7 +2253,7 @@ hook-list.h: generate-hooklist.sh Documentation/githooks.txt
22532253
$(QUIET_GEN)$(SHELL_PATH) ./generate-hooklist.sh >$@
22542254

22552255
SCRIPT_DEFINES = $(SHELL_PATH_SQ):$(DIFF_SQ):\
2256-
$(localedir_SQ):$(NO_CURL):$(USE_GETTEXT_SCHEME):$(SANE_TOOL_PATH_SQ):\
2256+
$(localedir_SQ):$(USE_GETTEXT_SCHEME):$(SANE_TOOL_PATH_SQ):\
22572257
$(gitwebdir_SQ):$(PERL_PATH_SQ):$(SANE_TEXT_GREP):$(PAGER_ENV):\
22582258
$(perllibdir_SQ)
22592259
GIT-SCRIPT-DEFINES: FORCE
@@ -2268,7 +2268,6 @@ sed -e '1s|#!.*/sh|#!$(SHELL_PATH_SQ)|' \
22682268
-e 's|@SHELL_PATH@|$(SHELL_PATH_SQ)|' \
22692269
-e 's|@@DIFF@@|$(DIFF_SQ)|' \
22702270
-e 's|@@LOCALEDIR@@|$(localedir_SQ)|g' \
2271-
-e 's/@@NO_CURL@@/$(NO_CURL)/g' \
22722271
-e 's/@@USE_GETTEXT_SCHEME@@/$(USE_GETTEXT_SCHEME)/g' \
22732272
-e $(BROKEN_PATH_FIX) \
22742273
-e 's|@@GITWEBDIR@@|$(gitwebdir_SQ)|g' \

0 commit comments

Comments
 (0)