From 37287de6c1a5d9e3861751d9cd78fb5244062152 Mon Sep 17 00:00:00 2001
From: Theodore Ts'o <tytso@mit.edu>
Date: Fri, 2 Nov 2007 21:53:00 -0400
Subject: [PATCH] --- yaml --- r: 77959 b: refs/heads/master c:
 4e7434ff028c4280bed620f28fdbf9f4d77d77ce h: refs/heads/master i:   77957:
 17b729091db129690184ca251b0ab39ba819f310   77955:
 dd1be5819caca7db946f3b239ffca2f024b0ab05   77951:
 a1c44875a1905c09c82e285ba0293ff6d24cd234 v: v3

---
 [refs]                        | 2 +-
 trunk/scripts/setlocalversion | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 5427ed647ba7..126a0c6e08fa 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d882421f4e08ddf0a94245cdbe516db260aa6f41
+refs/heads/master: 4e7434ff028c4280bed620f28fdbf9f4d77d77ce
diff --git a/trunk/scripts/setlocalversion b/trunk/scripts/setlocalversion
index 1b31da843672..acce8ebc5d40 100644
--- a/trunk/scripts/setlocalversion
+++ b/trunk/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