diff options
| author | Theodore Ts'o <tytso@mit.edu> | 2007-11-03 02:53:00 +0100 |
|---|---|---|
| committer | Sam Ravnborg <sam@ravnborg.org> | 2008-01-28 23:14:37 +0100 |
| commit | 4e7434ff028c4280bed620f28fdbf9f4d77d77ce (patch) | |
| tree | 63ce069f3a0dac118e70c46be3b3db5c81660094 | |
| parent | kbuild: change CONFIG_LOCALVERSION_AUTO to use a git-describe-ish format (diff) | |
| download | linux-4e7434ff028c4280bed620f28fdbf9f4d77d77ce.tar.xz linux-4e7434ff028c4280bed620f28fdbf9f4d77d77ce.zip | |
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>
| -rw-r--r-- | scripts/setlocalversion | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/scripts/setlocalversion b/scripts/setlocalversion index 1b31da843672..acce8ebc5d40 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 |