X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=GIT-VERSION-GEN;h=82fd72652b6d35837b8786005024263ac61630dd;hb=443f26cbcac66368eb0ec8a8a250bf5815ad0a10;hp=e5b1111a37fdd25da1b3bb3c0076313c4daeacff;hpb=bc32d342c2aaa1fa425e7924e4b64951a76bb314;p=git.git diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN index e5b1111a3..82fd72652 100755 --- a/GIT-VERSION-GEN +++ b/GIT-VERSION-GEN @@ -1,7 +1,7 @@ #!/bin/sh GVF=GIT-VERSION-FILE -DEF_VER=v1.7.1.rc1.GIT +DEF_VER=v1.7.1 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]*)