x86: unify arch/x86/boot/compressed/misc_??.c

[linux-2.6] / scripts / setlocalversion

diff --git a/scripts/setlocalversion b/scripts/setlocalversion
index 1b31da843672ab43adcfbca270f673f34a63258d..52f032e409a38b9c9eef8f5b340038d66805eb40 100644 (file)
--- a/scripts/setlocalversion
+++ b/scripts/setlocalversion
@@ -16,7 +16,9 @@ if head=`git rev-parse --verify HEAD 2>/dev/null`; then
        fi
 
        # Are there uncommitted changes?
-       if git diff-index HEAD | read dummy; then
+       git update-index --refresh --unmerged > /dev/null
+       if git diff-index --name-only HEAD | grep -v "^scripts/package" \
+           | read dummy; then
                printf '%s' -dirty
        fi