From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 8 Aug 2008 20:31:27 +0000 (-0700)
Subject: GIT-VERSION-GEN: mark the version 'dirty' only if there are modified files
X-Git-Tag: v1.6.0-rc3~25
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b13d44093bac2eb75f37be01f0e369290211472c;p=thirdparty%2Fgit.git

GIT-VERSION-GEN: mark the version 'dirty' only if there are modified files

We used to mark the version string with '-dirty' if the cache was not up
to date, but the only thing we want to know is if the binaries are built
from modified source.  Refresh the cache to avoid false dirtyness.

Christian Jaeger noticed this issue while building under fakeroot
environment (without -u) that lies about the file ownership data.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN
index cb7cd4b538..e1290d8901 100755
--- a/GIT-VERSION-GEN
+++ b/GIT-VERSION-GEN
@@ -16,6 +16,7 @@ elif test -d .git -o -f .git &&
 	case "$VN" in
 	*$LF*) (exit 1) ;;
 	v[0-9]*)
+		git update-index -q --refresh
 		test -z "$(git diff-index --name-only HEAD --)" ||
 		VN="$VN-dirty" ;;
 	esac