From e5fc9a0aea2c3c49829b5cdf499339e5c759706b Mon Sep 17 00:00:00 2001
From: Junio C Hamano <gitster@pobox.com>
Date: Sat, 16 Feb 2008 22:44:31 -0800
Subject: GIT 1.5.4.2

Signed-off-by: Junio C Hamano <gitster@pobox.com>
---
 GIT-VERSION-GEN | 13 +++----------
 1 file changed, 3 insertions(+), 10 deletions(-)

(limited to 'GIT-VERSION-GEN')

diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN
index 38a327397..03fb9d76a 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)
-- 
cgit v1.2.1