summaryrefslogtreecommitdiff
path: root/projects
diff options
context:
space:
mode:
authormichi_cc <michi_cc@openttd.org>2010-05-26 03:31:05 +0000
committermichi_cc <michi_cc@openttd.org>2010-05-26 03:31:05 +0000
commit3e7fc229ab83090dc48c8df244582ae4ad3e0d01 (patch)
treedafc7752f10bc796876164fa5141c9dd8528ad18 /projects
parent0599e8e97dc2b1754810b5f5cdac297856e056e7 (diff)
downloadopenttd-3e7fc229ab83090dc48c8df244582ae4ad3e0d01.tar.xz
(svn r19895) -Fix [FS#3836]: Git version detection would sometimes mistakenly identify a checkout as modified.
Diffstat (limited to 'projects')
-rwxr-xr-xprojects/determineversion.vbs8
1 files changed, 8 insertions, 0 deletions
diff --git a/projects/determineversion.vbs b/projects/determineversion.vbs
index 1c6f48552..0b4f27643 100755
--- 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 ...