X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=GIT-VERSION-GEN;h=14923c973bdcb87aaacb27f98eecc6215d5293b6;hb=326711c16879792da8d7159bf29d080569c3a1e0;hp=5d25b7e12b8ef678013be76af137587c32b1f9ea;hpb=210a0be504829bad5a2821488d3c25cc406fed4a;p=git.git diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN index 5d25b7e12..14923c973 100755 --- a/GIT-VERSION-GEN +++ b/GIT-VERSION-GEN @@ -1,11 +1,19 @@ #!/bin/sh GVF=GIT-VERSION-FILE -DEF_VER=v1.4.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