Commit 4e7434ff authored by Theodore Ts'o's avatar Theodore Ts'o Committed by Sam Ravnborg

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: default avatar"Theodore Ts'o" <tytso@mit.edu>
Signed-off-by: default avatarSam Ravnborg <sam@ravnborg.org>
parent d882421f
...@@ -16,6 +16,7 @@ if head=`git rev-parse --verify HEAD 2>/dev/null`; then ...@@ -16,6 +16,7 @@ if head=`git rev-parse --verify HEAD 2>/dev/null`; then
fi fi
# Are there uncommitted changes? # Are there uncommitted changes?
git update-index --refresh --unmerged > /dev/null
if git diff-index HEAD | read dummy; then if git diff-index HEAD | read dummy; then
printf '%s' -dirty printf '%s' -dirty
fi fi
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment