X-Git-Url: https://git.octo.it/?p=git.git;a=blobdiff_plain;f=GIT-VERSION-GEN;h=5d25b7e12b8ef678013be76af137587c32b1f9ea;hp=d6d1ae0338085d8d3ea567d8007f05ab5f2ee554;hb=HEAD;hpb=be972922d034e4b007e0f644a7285266863f2cbc diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN index d6d1ae03..5d25b7e1 100755 --- a/GIT-VERSION-GEN +++ b/GIT-VERSION-GEN @@ -1,11 +1,11 @@ #!/bin/sh GVF=GIT-VERSION-FILE -DEF_VER=v1.2.GIT +DEF_VER=v1.4.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 +if VN=$(git describe --abbrev=4 HEAD 2>/dev/null); then VN=$(echo "$VN" | sed -e 's/-/./g'); elif test -f version then @@ -16,7 +16,7 @@ fi VN=$(expr "$VN" : v*'\(.*\)') -dirty=$(sh -c 'git-diff-index --name-only HEAD' 2>/dev/null) || dirty= +dirty=$(sh -c 'git diff-index --name-only HEAD' 2>/dev/null) || dirty= case "$dirty" in '') ;;