Merge branch 'maint' of git://repo.or.cz/git/fastimport into maint

diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN
index a461518cdee5074899f04156c457a3dd78ea23ec..094a0d1b0e69081f9cd6d923c0329978d0187cb0 100755 (executable)
--- a/GIT-VERSION-GEN
+++ b/GIT-VERSION-GEN
@@ -1,15 +1,24 @@
 #!/bin/sh
 
 GVF=GIT-VERSION-FILE
-DEF_VER=v1.3.GIT
+DEF_VER=v1.5.1.4.GIT
 
-# 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
-       VN=$(echo "$VN" | sed -e 's/-/./g');
-elif test -f version
+LF='
+'
+
+# First see if there is a version file (included in release tarballs),
+# then try git-describe, then default.
+if test -f version
 then
        VN=$(cat version) || VN="$DEF_VER"
+elif test -d .git &&
+       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
        VN="$DEF_VER"
 fi