X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=GIT-VERSION-GEN;h=d6d1ae0338085d8d3ea567d8007f05ab5f2ee554;hb=79f558a5fc1c471e5db926a1272fe930f24784bb;hp=72201be57c633259e65b435f8623a80e4cdc3e88;hpb=90768daaa006516c7ae69ed89d7c2e67243dfac1;p=git.git diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN index 72201be5..d6d1ae03 100755 --- a/GIT-VERSION-GEN +++ b/GIT-VERSION-GEN @@ -1,14 +1,17 @@ #!/bin/sh GVF=GIT-VERSION-FILE -DEF_VER=v1.1.GIT +DEF_VER=v1.2.GIT # 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 VN=$(echo "$VN" | sed -e 's/-/./g'); -else +elif test -f version +then VN=$(cat version) || VN="$DEF_VER" +else + VN="$DEF_VER" fi VN=$(expr "$VN" : v*'\(.*\)')