summaryrefslogtreecommitdiff
path: root/GIT-VERSION-GEN
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2008-02-17 06:44:31 (GMT)
committerJunio C Hamano <gitster@pobox.com>2008-02-17 08:20:38 (GMT)
commite5fc9a0aea2c3c49829b5cdf499339e5c759706b (patch)
treefb315aede695ed8b618cb295eedbc361bd959f68 /GIT-VERSION-GEN
parent965053b09a2de5687b9098cb05edc9bfbf1d26b3 (diff)
downloadgit-e5fc9a0aea2c3c49829b5cdf499339e5c759706b.zip
git-e5fc9a0aea2c3c49829b5cdf499339e5c759706b.tar.gz
git-e5fc9a0aea2c3c49829b5cdf499339e5c759706b.tar.bz2
GIT 1.5.4.2v1.5.4.2
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'GIT-VERSION-GEN')
-rwxr-xr-xGIT-VERSION-GEN13
1 files changed, 3 insertions, 10 deletions
diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN
index 38a3273..03fb9d7 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)