X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=GIT-VERSION-GEN;h=1ad324e23696f66451a9ffc05d77f459bf106e83;hb=55029ae4dac07942437c0c715ea7c8ac60dd3576;hp=3c0032cec592a765692234f1cba47dfdcc3a9200;hpb=65c6a4696a760f518c9f262705de030323c11146;p=git.git diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN index 3c0032cec..1ad324e23 100755 --- a/GIT-VERSION-GEN +++ b/GIT-VERSION-GEN @@ -1,7 +1,7 @@ #!/bin/sh GVF=GIT-VERSION-FILE -DEF_VER=v1.5.3.GIT +DEF_VER=v1.5.4.GIT LF=' ' @@ -15,7 +15,8 @@ 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]*) + git diff-index --quiet HEAD || VN="$VN-dirty" ;; esac then VN=$(echo "$VN" | sed -e 's/-/./g'); @@ -25,14 +26,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)