Merge branch 'ph/rerere-doc' into maint-1.7.8

[git.git] / GIT-VERSION-GEN

diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN
index a668143d7a42dd6323d73b9acee62ac7a992f7ea..c95c200eebfcfb1ff935045ee2fb850d317a03a7 100755 (executable)
--- a/GIT-VERSION-GEN
+++ b/GIT-VERSION-GEN
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 GVF=GIT-VERSION-FILE
-DEF_VER=v1.7.0.GIT
+DEF_VER=v1.7.8.5
 
 LF='
 '
@@ -12,7 +12,7 @@ if test -f version
 then
        VN=$(cat version) || VN="$DEF_VER"
 elif test -d .git -o -f .git &&
-       VN=$(git describe --abbrev=4 HEAD 2>/dev/null) &&
+       VN=$(git describe --match "v[0-9]*" --abbrev=4 HEAD 2>/dev/null) &&
        case "$VN" in
        *$LF*) (exit 1) ;;
        v[0-9]*)