X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=blobdiff_plain;f=GIT-VERSION-GEN;h=4eac314f3a12b36c379fec139de6aecee5a0a2b6;hb=91fd2bf3fdc72351532a8fd74cdd0da37b036ed1;hp=a461518cdee5074899f04156c457a3dd78ea23ec;hpb=3f69d405d749742945afd462bff6541604ecd420;p=git.git diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN index a461518cd..4eac314f3 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.4.1.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