summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDennis Kaarsemaker <dennis@kaarsemaker.net>2014-05-31 22:25:10 +0200
committerJunio C Hamano <gitster@pobox.com>2014-06-02 12:40:43 -0700
commita6def7ed2fc8d4e07121948212583b3e9b095bba (patch)
tree3e2d33fc187c59082cfed6740a9f035fc422b22d
parente156455ea49124c140a67623f22a393db62d5d98 (diff)
downloadgit-dk/makefile-dist.tar.gz
Makefile: don't hardcode HEAD in dist targetdk/makefile-dist
Instead of calling git-archive HEAD^{tree}, use $(GIT_VERSION)^{tree}. This makes sure the archive name and contents are consistent, if HEAD has moved, but GIT-VERSION-FILE hasn't been regenerated yet. Signed-off-by: Dennis Kaarsemaker <dennis@kaarsemaker.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rw-r--r--Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index a53f3a8326..63d9bac4b0 100644
--- a/Makefile
+++ b/Makefile
@@ -2433,7 +2433,7 @@ git.spec: git.spec.in GIT-VERSION-FILE
GIT_TARNAME = git-$(GIT_VERSION)
dist: git.spec git-archive$(X) configure
./git-archive --format=tar \
- --prefix=$(GIT_TARNAME)/ HEAD^{tree} > $(GIT_TARNAME).tar
+ --prefix=$(GIT_TARNAME)/ $(GIT_VERSION)^{tree} > $(GIT_TARNAME).tar
@mkdir -p $(GIT_TARNAME)
@cp git.spec configure $(GIT_TARNAME)
@echo $(GIT_VERSION) > $(GIT_TARNAME)/version