X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=GIT-VERSION-GEN;h=e88fe5ae7cd6c4b9e423a95ec125e4697467f0f1;hb=42b5c78845feb44f1d36eecad4c72336d5c2a9c5;hp=1056b7c817f8578348120f64ad7047754bf688df;hpb=057f98eda179491c3f32c556f523e8786c2cbab5;p=git.git diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN index 1056b7c8..e88fe5ae 100755 --- a/GIT-VERSION-GEN +++ b/GIT-VERSION-GEN @@ -1,14 +1,17 @@ #!/bin/sh GVF=GIT-VERSION-FILE -DEF_VER=v1.2.GIT +DEF_VER=v1.3-rc4.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*'\(.*\)')