diff options
| author | Junio C Hamano <gitster@pobox.com> | 2008-02-17 01:16:44 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-02-17 01:16:44 -0800 |
| commit | 7cb97da17da080b88ceb0417108e6a3cb6c6299f (patch) | |
| tree | f3940fe7061ce10d3f91d082bffc290c10e3491b /GIT-VERSION-GEN | |
| parent | f8732c5596eb58d0daafdd61355e59831a95ae2e (diff) | |
| parent | e5fc9a0aea2c3c49829b5cdf499339e5c759706b (diff) | |
| download | git-7cb97da17da080b88ceb0417108e6a3cb6c6299f.tar.gz | |
Merge branch 'maint'
* maint:
GIT 1.5.4.2
Diffstat (limited to 'GIT-VERSION-GEN')
| -rwxr-xr-x | GIT-VERSION-GEN | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN index 38a3273974..03fb9d76ae 100755 --- a/GIT-VERSION-GEN +++ b/GIT-VERSION-GEN @@ -1,7 +1,7 @@ #!/bin/sh GVF=GIT-VERSION-FILE -DEF_VER=v1.5.4.GIT +DEF_VER=v1.5.4.2.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) |