[PATCHv2 2/8] Makefile: do not replace @@GIT_USER_AGENT@@ in scripts
- From
Jeff King <peff@peff.net>
- Date
- Jun 19, 2012, 23:24 UTC
- Message-ID
- <20120619232453.GB6496@sigill.intra.peff.net>
- In-Reply-To
- <20120619232231.GA6328@sigill.intra.peff.net>
No scripts actually care about this replacement. This was erroneously added by d937411.
Signed-off-by: Jeff King <peff@peff.net> --- I think I started that series by just replacing GIT_USER_AGENT everywhere that GIT_VERSION was before realizing that I didn't need to do that at all, and this was leftover cruft.
Technically I could re-roll jk/version-string with this squashed in, since you are probably about to do the post-release rewind of next, but I don't know that it's worth the trouble unless we are re-rolling the whole thing (to put the Makefile fixups first, and then build version-string stuff on top).
Makefile | 1 - 1 file changed, 1 deletion(-)
diff --git a/Makefile b/Makefile index 537d2ea..23c289d 100644 --- a/Makefile +++ b/Makefile @@ -2010,7 +2010,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' \
-- 1.7.11.rc3.5.g201460b