From: Theodore Ts'o <tytso@mit.edu>
Date: Sat, 3 Nov 2007 01:53:00 +0000 (-0400)
Subject: kbuild: fix scripts/setlocalversion to avoid erroneous -dirty tag
X-Git-Tag: v2.6.25-rc1~1164^2~49
X-Git-Url: http://www.pilppa.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=4e7434ff028c4280bed620f28fdbf9f4d77d77ce;p=linux-2.6-omap-h63xx.git

kbuild: fix scripts/setlocalversion to avoid erroneous -dirty tag

If git's index file is out of date, and some files have been touched
such that their timestamp doesn't what is in the index, "git
diff-index HEAD" may show that a particular file is dirty, when in
fact it really isn't.  Running "git update-index" will update the
index to avoid these false positives.

Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
---

diff --git a/scripts/setlocalversion b/scripts/setlocalversion
index 1b31da84367..acce8ebc5d4 100644
--- a/scripts/setlocalversion
+++ b/scripts/setlocalversion
@@ -16,6 +16,7 @@ if head=`git rev-parse --verify HEAD 2>/dev/null`; then
 	fi
 
 	# Are there uncommitted changes?
+	git update-index --refresh --unmerged > /dev/null
 	if git diff-index HEAD | read dummy; then
 		printf '%s' -dirty
 	fi