# HG changeset patch
# User michi_cc <michi_cc@openttd.org>
# Date 2010-05-26 03:31:05
# Node ID 61ec821d955cc26a17f347cb775769164e7983e7
# Parent  2dd515c2025cd6cb2b936a688f4fe11984c2b36a

(svn r19895) -Fix [FS#3836]: Git version detection would sometimes mistakenly identify a checkout as modified.

diff --git a/findversion.sh b/findversion.sh
--- a/findversion.sh
+++ b/findversion.sh
@@ -87,6 +87,8 @@ if [ -d "$ROOT_DIR/.svn" ]; then
 	fi
 elif [ -d "$ROOT_DIR/.git" ]; then
 	# We are a git checkout
+	# Refresh the index to make sure file stat info is in sync, then look for modifications
+	git update-index --refresh >/dev/null
 	if [ -n "`git diff-index HEAD \"$SRC_DIR\"`" ]; then
 		MODIFIED="2"
 	fi
diff --git a/projects/determineversion.vbs b/projects/determineversion.vbs
--- a/projects/determineversion.vbs
+++ b/projects/determineversion.vbs
@@ -171,6 +171,14 @@ Function DetermineSVNVersion()
 			If oExec.ExitCode = 0 Then
 				hash = oExec.StdOut.ReadLine()
 				version = "g" & Mid(hash, 1, 8)
+				' Make sure index is in sync with disk
+				Set oExec = WshShell.Exec("git update-index --refresh")
+				If Err.Number = 0 Then
+					' Wait till the application is finished ...
+					Do While oExec.Status = 0
+						WScript.Sleep 10
+					Loop
+				End If
 				Set oExec = WshShell.Exec("git diff-index --exit-code --quiet HEAD ../src")
 				If Err.Number = 0 Then
 					' Wait till the application is finished ...