X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=GIT-VERSION-GEN;h=14923c973bdcb87aaacb27f98eecc6215d5293b6;hb=f685d07de045423a69045e42e72d2efc22a541ca;hp=a461518cdee5074899f04156c457a3dd78ea23ec;hpb=4d8df3feb806ef85693a9f7c4b8c20ca5c1caa56;p=git.git diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN index a461518cd..14923c973 100755 --- a/GIT-VERSION-GEN +++ b/GIT-VERSION-GEN @@ -1,11 +1,19 @@ #!/bin/sh GVF=GIT-VERSION-FILE -DEF_VER=v1.3.GIT +DEF_VER=v1.4.2.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'); elif test -f version then