From ed081894f8d336b834b0ee5cd07944eca0653dab Mon Sep 17 00:00:00 2001
From: Mark Pizzolato <mark@infocomm.com>
Date: Sat, 1 Sep 2018 01:59:10 -0700
Subject: [PATCH] Visual Studio Projects: Avoid temporary file validating
 current git commit it

---
 Visual Studio Projects/Pre-Build-Event.cmd | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/Visual Studio Projects/Pre-Build-Event.cmd b/Visual Studio Projects/Pre-Build-Event.cmd
index 43777a62..2b653de4 100644
--- a/Visual Studio Projects/Pre-Build-Event.cmd	
+++ b/Visual Studio Projects/Pre-Build-Event.cmd	
@@ -341,17 +341,13 @@ SET ACTUAL_GIT_COMMIT_ID=
 SET ACTUAL_GIT_COMMIT_TIME=
 SET GIT_COMMIT_ID=
 SET GIT_COMMIT_TIME=
-SET _GIT_COMMIT_ID_TEMP=.git-commit-id-temp-%RANDOM%
-"%_GIT_GIT%" log -1 --pretty="SIM_GIT_COMMIT_ID %%H%%nSIM_GIT_COMMIT_TIME %%aI" >%_GIT_COMMIT_ID_TEMP%
-for /F "usebackq tokens=2" %%i in (`findstr /C:SIM_GIT_COMMIT_ID %_GIT_COMMIT_ID_TEMP%`) do SET ACTUAL_GIT_COMMIT_ID=%%i
-for /F "usebackq tokens=2" %%i in (`findstr /C:SIM_GIT_COMMIT_TIME %_GIT_COMMIT_ID_TEMP%`) do SET ACTUAL_GIT_COMMIT_TIME=%%i
+for /F "usebackq tokens=1" %%i in (`git log -1 "--pretty=%%H"`) do SET ACTUAL_GIT_COMMIT_ID=%%i
+for /F "usebackq tokens=1" %%i in (`git log -1 "--pretty=%%aI"`) do SET ACTUAL_GIT_COMMIT_TIME=%%i
 if exist ..\.git-commit-id for /F "usebackq tokens=2" %%i in (`findstr /C:SIM_GIT_COMMIT_ID ..\.git-commit-id`) do SET GIT_COMMIT_ID=%%i
 if exist ..\.git-commit-id for /F "usebackq tokens=2" %%i in (`findstr /C:SIM_GIT_COMMIT_TIME ..\.git-commit-id`) do SET GIT_COMMIT_TIME=%%i
-if "%ACTUAL_GIT_COMMIT_ID%" neq "%GIT_COMMIT_ID%" move /Y %_GIT_COMMIT_ID_TEMP% ..\.git-commit-id
-if "%ACTUAL_GIT_COMMIT_ID%" equ "%GIT_COMMIT_ID%" del %_GIT_COMMIT_ID_TEMP%
+if "%ACTUAL_GIT_COMMIT_ID%" neq "%GIT_COMMIT_ID%" "%_GIT_GIT%" log -1 --pretty="SIM_GIT_COMMIT_ID %%H%%nSIM_GIT_COMMIT_TIME %%aI" >..\.git-commit-id
 SET GIT_COMMIT_ID=%ACTUAL_GIT_COMMIT_ID%
 SET GIT_COMMIT_TIME=%ACTUAL_GIT_COMMIT_TIME%
-SET _GIT_COMMIT_ID_TEMP=
 SET ACTUAL_GIT_COMMIT_ID=
 SET ACTUAL_GIT_COMMIT_TIME=
 :_VerifyGitCommitId.h