From 656f8a3c618800156e487e127238f1140468442b Mon Sep 17 00:00:00 2001
From: sawinglogz <3787776-sawinglogz@users.noreply.gitlab.com>
Date: Thu, 16 Jan 2020 17:47:48 -0500
Subject: [PATCH] Attempt to update update_gitinfo.bat to match the bash
 script.

This is almost certain to be broken. Somebody with a Windows build
environment will need to test and fix it.
---
 oscar/update_gitinfo.bat | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/oscar/update_gitinfo.bat b/oscar/update_gitinfo.bat
index ac1cb0f0..e29fcc31 100755
--- a/oscar/update_gitinfo.bat
+++ b/oscar/update_gitinfo.bat
@@ -3,16 +3,20 @@ setlocal
 set DIR=%~dp0
 cd %DIR%
 
-for /f %%i in ('git rev-parse --abbrev-ref HEAD') do set GIT_BRANCH=%%i
-for /f %%i in ('git rev-parse --short HEAD') do set GIT_REVISION=%%i
-git diff-index --quiet HEAD -- || set GIT_REVISION=%GIT_REVISION%-plus
-
-if "%GIT_BRANCH"=="" set GIT_BRANCH="Unknown"
-if "%GIT_REVISION"=="" set GIT_REVISION="Unknown"
+if ('git rev-parse --git-dir') (
+  for /f %%i in ('git rev-parse --abbrev-ref HEAD') do set GIT_BRANCH=%%i
+  for /f %%i in ('git rev-parse --short HEAD') do set GIT_REVISION=%%i
+  if ('git diff-index --quiet HEAD --') (
+    set GIT_REVISION=%GIT_REVISION%-plus
+  ) else (
+    for /f %%i in ('git describe --exact-match --tags') do set GIT_TAG=%%i
+  )
+)
 
 echo // This is an auto generated file > %DIR%git_info.new
-echo const QString GIT_BRANCH="%GIT_BRANCH%"; >> %DIR%git_info.new
-echo const QString GIT_REVISION="%GIT_REVISION%"; >> %DIR%git_info.new
+if "%GIT_BRANCH"!=""  echo #define GIT_BRANCH "%GIT_BRANCH%" >> %DIR%git_info.new
+if "%GIT_REVISION!="" echo #define GIT_REVISION "%GIT_REVISION%" >> %DIR%git_info.new
+if "%GIT_TAG"!=""     echo #define GIT_TAG "%GIT_TAG%" >> %DIR%git_info.new
 
 fc %DIR%git_info.h %DIR%git_info.new >nul 2>nul && del /q %DIR%git_info.new || goto NewFile
 goto AllDone