X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=GIT-VERSION-GEN;h=445190db7ad328a91ad90621dcc4a649cbc67575;hb=a61ba26a4725d4a93297305315587b92324baf0b;hp=a668143d7a42dd6323d73b9acee62ac7a992f7ea;hpb=c444c16589f95ac22d8e3ffe603cd7f0613512ce;p=git.git diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN index a668143d7..445190db7 100755 --- 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.4 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]*)