diff options
| -rwxr-xr-x | findversion.sh | 2 | ||||
| -rwxr-xr-x | projects/determineversion.vbs | 8 |
2 files changed, 10 insertions, 0 deletions
diff --git a/findversion.sh b/findversion.sh index c792ec811..6d5f18e52 100755 --- 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 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 ... |