X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=GIT-VERSION-GEN;h=5d25b7e12b8ef678013be76af137587c32b1f9ea;hb=1a82e79315ed633f6b0b1fc4076054950c5380d3;hp=e3cd9fa09422236063053faf61d358dc98f4d4d0;hpb=5c7d3c9507f74a6f5c3f44915c42ee9ec22c1211;p=git.git

diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN
index e3cd9fa0..5d25b7e1 100755
--- a/GIT-VERSION-GEN
+++ b/GIT-VERSION-GEN
@@ -1,17 +1,22 @@
 #!/bin/sh
 
 GVF=GIT-VERSION-FILE
-DEF_VER=v1.1.GIT
+DEF_VER=v1.4.GIT
 
 # 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 | sed -e 's/-/./g') ||
-VN=$(cat version) ||
-VN="$DEF_VER"
+if VN=$(git describe --abbrev=4 HEAD 2>/dev/null); then
+	VN=$(echo "$VN" | sed -e 's/-/./g');
+elif test -f version
+then
+	VN=$(cat version) || VN="$DEF_VER"
+else
+	VN="$DEF_VER"
+fi
 
 VN=$(expr "$VN" : v*'\(.*\)')
 
-dirty=$(sh -c 'git-diff-index --name-only HEAD' 2>/dev/null) || dirty=
+dirty=$(sh -c 'git diff-index --name-only HEAD' 2>/dev/null) || dirty=
 case "$dirty" in
 '')
 	;;