X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=GIT-VERSION-GEN;h=0d4c2f79c58a2141dc5d5d6998f7ab2a2fa31881;hb=c8744d6a8b27115503565041566d97c21e722584;hp=7fbde233b86812b2bda51878cf4d09ad18c2062b;hpb=806ea701ce3624aa6a89648b6ca5d858703398cb;p=git.git diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN index 7fbde233b..0d4c2f79c 100755 --- a/GIT-VERSION-GEN +++ b/GIT-VERSION-GEN @@ -1,7 +1,7 @@ #!/bin/sh GVF=GIT-VERSION-FILE -DEF_VER=v1.5.3.2.GIT +DEF_VER=v1.5.4.3.GIT LF=' ' @@ -15,7 +15,9 @@ elif test -d .git && VN=$(git describe --abbrev=4 HEAD 2>/dev/null) && case "$VN" in *$LF*) (exit 1) ;; - v[0-9]*) : happy ;; + v[0-9]*) + test -z "$(git diff-index --name-only HEAD)" || + VN="$VN-dirty" ;; esac then VN=$(echo "$VN" | sed -e 's/-/./g'); @@ -25,14 +27,6 @@ fi VN=$(expr "$VN" : v*'\(.*\)') -dirty=$(sh -c 'git diff-index --name-only HEAD' 2>/dev/null) || dirty= -case "$dirty" in -'') - ;; -*) - VN="$VN-dirty" ;; -esac - if test -r $GVF then VC=$(sed -e 's/^GIT_VERSION = //' <$GVF)