X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=GIT-VERSION-GEN;h=5d25b7e12b8ef678013be76af137587c32b1f9ea;hb=e968751573a4ded76201a0e4414ec36649a92dda;hp=656f55542cd098157caf8654a0d6e6ec98144ebf;hpb=a0a01958d7c059b1535b79a80dc37181b25bb677;p=git.git diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN index 656f5554..5d25b7e1 100755 --- a/GIT-VERSION-GEN +++ b/GIT-VERSION-GEN @@ -1,11 +1,11 @@ #!/bin/sh GVF=GIT-VERSION-FILE -DEF_VER=v1.3-rc3.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 '') ;;