Skip to content

Commit 2b9391b

Browse files
peffgitster
authored andcommitted
Makefile: do not replace @@GIT_VERSION@@ in shell scripts
No shell script actually uses the replacement (it is used in some perl scripts, but cmd_munge_script only handles shell scripts). We can also therefore drop the dependency on GIT-VERSION-FILE. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
1 parent be1dbd0 commit 2b9391b

File tree

1 file changed

+0
-3
lines changed

1 file changed

+0
-3
lines changed

Makefile

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2012,7 +2012,6 @@ $(RM) $@ $@+ && \
20122012
sed -e '1s|#!.*/sh|#!$(SHELL_PATH_SQ)|' \
20132013
-e 's|@SHELL_PATH@|$(SHELL_PATH_SQ)|' \
20142014
-e 's|@@DIFF@@|$(DIFF_SQ)|' \
2015-
-e 's/@@GIT_VERSION@@/$(GIT_VERSION)/g' \
20162015
-e 's|@@LOCALEDIR@@|$(localedir_SQ)|g' \
20172016
-e 's/@@NO_CURL@@/$(NO_CURL)/g' \
20182017
-e 's/@@USE_GETTEXT_SCHEME@@/$(USE_GETTEXT_SCHEME)/g' \
@@ -2058,7 +2057,6 @@ gitweb:
20582057
git-instaweb: git-instaweb.sh gitweb
20592058
$(QUIET_GEN)$(RM) $@ $@+ && \
20602059
sed -e '1s|#!.*/sh|#!$(SHELL_PATH_SQ)|' \
2061-
-e 's/@@GIT_VERSION@@/$(GIT_VERSION)/g' \
20622060
-e 's/@@NO_CURL@@/$(NO_CURL)/g' \
20632061
-e 's|@@GITWEBDIR@@|$(gitwebdir_SQ)|g' \
20642062
-e 's|@@PERL@@|$(PERL_PATH_SQ)|g' \
@@ -2107,7 +2105,6 @@ configure: configure.ac
21072105

21082106
# These can record GIT_VERSION
21092107
version.o git.spec \
2110-
$(patsubst %.sh,%,$(SCRIPT_SH)) \
21112108
$(patsubst %.perl,%,$(SCRIPT_PERL)) \
21122109
: GIT-VERSION-FILE
21132110

0 commit comments

Comments
 (0)