aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeff King <peff@peff.net>2012-06-20 14:31:42 -0400
committerJunio C Hamano <gitster@pobox.com>2012-07-09 07:57:29 -0700
commit47eb28ec0cdb372f4354800e2e0ec713ad4c1992 (patch)
tree1e76954a9a05b99c6e9408340ac38b1ddcd04b6d
parentc0219dd5d8cd11ea7a112081efd1db59d0bec105 (diff)
downloadgit-47eb28ec0cdb372f4354800e2e0ec713ad4c1992.tar.gz
git-47eb28ec0cdb372f4354800e2e0ec713ad4c1992.tar.xz
Makefile: do not replace @@GIT_USER_AGENT@@ in scripts
No scripts actually care about this replacement. This was erroneously added by 42dcbb7 (version: add git_user_agent function, 2012-06-02). Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rw-r--r--Makefile1
1 files changed, 0 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index 3f82b51b8..d41231529 100644
--- a/Makefile
+++ b/Makefile
@@ -2007,7 +2007,6 @@ sed -e '1s|#!.*/sh|#!$(SHELL_PATH_SQ)|' \
-e 's|@SHELL_PATH@|$(SHELL_PATH_SQ)|' \
-e 's|@@DIFF@@|$(DIFF_SQ)|' \
-e 's/@@GIT_VERSION@@/$(GIT_VERSION)/g' \
- -e 's|@@GIT_USER_AGENT@@|$(GIT_USER_AGENT_SQ)|g' \
-e 's|@@LOCALEDIR@@|$(localedir_SQ)|g' \
-e 's/@@NO_CURL@@/$(NO_CURL)/g' \
-e 's/@@USE_GETTEXT_SCHEME@@/$(USE_GETTEXT_SCHEME)/g' \