X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=GIT-VERSION-GEN;h=a461518cdee5074899f04156c457a3dd78ea23ec;hb=74237d6236d7e32f69469ff26df3f3bb3875f523;hp=d6d1ae0338085d8d3ea567d8007f05ab5f2ee554;hpb=539d84fe0a661f4e273d8a22e74d55d2fafc7598;p=git.git diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN index d6d1ae03..a461518c 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.3.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 '') ;;