X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;ds=sidebyside;f=GIT-VERSION-GEN;h=0cacac38fcfb8a98e70ac186cf5d783d925b3556;hb=91c23e48d0666a673dd14760bb00f6d59234d9d9;hp=1056b7c817f8578348120f64ad7047754bf688df;hpb=ee072260dbff6914c24d956bcc2d46882831f1a0;p=git.git

diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN
index 1056b7c81..0cacac38f 100755
--- a/GIT-VERSION-GEN
+++ b/GIT-VERSION-GEN
@@ -1,19 +1,30 @@
 #!/bin/sh
 
 GVF=GIT-VERSION-FILE
-DEF_VER=v1.2.GIT
+DEF_VER=v1.4.3.GIT
+
+LF='
+'
 
 # First try git-describe, then see if there is a version file
 # (included in release tarballs), then default
-if VN=$(git-describe --abbrev=4 HEAD 2>/dev/null); then
+if VN=$(git describe --abbrev=4 HEAD 2>/dev/null) &&
+   case "$VN" in
+   *$LF*) (exit 1) ;;
+   v[0-9]*) : happy ;;
+   esac
+then
 	VN=$(echo "$VN" | sed -e 's/-/./g');
-else
+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
 '')
 	;;