aboutsummaryrefslogtreecommitdiffstats
path: root/scripts/setlocalversion
diff options
context:
space:
mode:
authorTheodore Ts'o <tytso@mit.edu>2007-11-03 01:53:00 (GMT)
committerSam Ravnborg <sam@ravnborg.org>2008-01-28 22:14:37 (GMT)
commit4e7434ff028c4280bed620f28fdbf9f4d77d77ce (patch)
tree63ce069f3a0dac118e70c46be3b3db5c81660094 /scripts/setlocalversion
parentd882421f4e08ddf0a94245cdbe516db260aa6f41 (diff)
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>
Diffstat (limited to 'scripts/setlocalversion')
-rw-r--r--scripts/setlocalversion1
1 files changed, 1 insertions, 0 deletions
diff --git a/scripts/setlocalversion b/scripts/setlocalversion
index 1b31da8..acce8eb 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

Privacy Policy