Anonymous committed 181129d

For release tarballs, include the proper version

When producing a release tarball, include a "version" file, which
GIT-VERSION-GEN can then use to do the right thing when building from a

Signed-off-by: H. Peter Anvin <>
Signed-off-by: Junio C Hamano <>

  • Participants
  • Parent commits 5a2282d

Comments (0)

Files changed (2)

-VN=$(git-describe --abbrev=4 HEAD 2>/dev/null) || VN=v1.0.GIT
-VN=$(expr "$VN" : v'\(.*\)')
+# First try git-describe, then see if there is a version file
+# (included in release tarballs), then default
+VN=$(git-describe --abbrev=4 HEAD 2>/dev/null) ||
+VN=$(cat version) ||
+VN=$(expr "$VN" : v*'\(.*\)')
 if test -r $GVF
 	VC=$(sed -e 's/^GIT_VERSION = //' <$GVF)
 	./git-tar-tree HEAD $(GIT_TARNAME) > $(GIT_TARNAME).tar
 	@mkdir -p $(GIT_TARNAME)
 	@cp git.spec $(GIT_TARNAME)
-	$(TAR) rf $(GIT_TARNAME).tar $(GIT_TARNAME)/git.spec
+	@echo $(GIT_VERSION) > $(GIT_TARNAME)/version
+	$(TAR) rf $(GIT_TARNAME).tar \
+		$(GIT_TARNAME)/git.spec $(GIT_TARNAME)/version
 	@rm -rf $(GIT_TARNAME)
 	gzip -f -9 $(GIT_TARNAME).tar