From 59233259174c940262889bb76c7daffd6461bb82 Mon Sep 17 00:00:00 2001
From: sawinglogz <3787776-sawinglogz@users.noreply.gitlab.com>
Date: Tue, 7 May 2019 09:41:51 -0400
Subject: [PATCH] Multiple update_gitinfo tweaks.

Change -C to --work-dir to work on earlier versions of git.
Add "+" to the revision number if there are uncommitted changes.
Only rewrite the git_info.h if there are changes, so that make doesn't think the file has changed.
---
 oscar/update_gitinfo.bat | 26 ++++++++++++++++++--------
 oscar/update_gitinfo.sh  | 22 ++++++++++++++++------
 2 files changed, 34 insertions(+), 14 deletions(-)
 mode change 100644 => 100755 oscar/update_gitinfo.sh

diff --git a/oscar/update_gitinfo.bat b/oscar/update_gitinfo.bat
index 9b0f7bf3..5f85c45d 100644
--- a/oscar/update_gitinfo.bat
+++ b/oscar/update_gitinfo.bat
@@ -2,14 +2,24 @@
 setlocal
 set DIR=%~dp0
 
-echo Updating %DIR%git_info.h
-
-for /f %%i in ('git -C %DIR% rev-parse --abbrev-ref HEAD') do set GIT_BRANCH=%%i
-for /f %%i in ('git -C %DIR% rev-parse --short HEAD') do set GIT_REVISION=%%i
+for /f %%i in ('git --work-tree %DIR% rev-parse --abbrev-ref HEAD') do set GIT_BRANCH=%%i
+for /f %%i in ('git --work-tree %DIR% rev-parse --short HEAD') do set GIT_REVISION=%%i
+git --work-tree $DIR diff-index --quiet HEAD
+if %ERRORLEVEL% neq 0 (
+    do set GIT_REVISION="%GIT_REVISION%+"  # uncommitted changes
+)
 
 if "%GIT_BRANCH"=="" set GIT_BRANCH="Unknown";
-if "%GIT_REVIISION"=="" set GIT_REVISION="Unknown";
+if "%GIT_REVISION"=="" set GIT_REVISION="Unknown";
 
-echo // This is an auto generated file > %DIR%git_info.h
-echo const QString GIT_BRANCH="%GIT_BRANCH%"; >> %DIR%git_info.h
-echo const QString GIT_REVISION="%GIT_REVISION%"; >> %DIR%git_info.h
+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
+
+fc %DIR%git_info.h %DIR%git_info.new > nul
+if errorlevel 0 (
+    del /y %DIR%git_info.new
+) else (
+    echo Updating %DIR%git_info.h
+    move /y %DIR%git_info.new %DIR%git_info.h
+)
diff --git a/oscar/update_gitinfo.sh b/oscar/update_gitinfo.sh
old mode 100644
new mode 100755
index 0fb8f7ee..909ac299
--- a/oscar/update_gitinfo.sh
+++ b/oscar/update_gitinfo.sh
@@ -2,14 +2,24 @@
 
 DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 cd $DIR
-echo Updating $DIR/git_info.h
 
-GIT_BRANCH=`git -C $DIR rev-parse --abbrev-ref HEAD`
-GIT_REVISION=`git -C $DIR rev-parse --short HEAD`
+GIT_BRANCH=`git --work-tree $DIR rev-parse --abbrev-ref HEAD`
+GIT_REVISION=`git --work-tree $DIR rev-parse --short HEAD`
+$(git --work-tree $DIR diff-index --quiet HEAD)
+if [ $? -ne 0 ]; then
+    GIT_REVISION="$GIT_REVISION+"  # uncommitted changes
+fi
 
 [ -z "$GIT_BRANCH" ] &&	GIT_BRANCH="Unknown";
 [ -z "$GIT_REVISION" ] && GIT_REVISION="Unknown";
 
-echo // This is an auto generated file > $DIR/git_info.h
-echo const QString GIT_BRANCH=\"$GIT_BRANCH\"\; >> $DIR/git_info.h
-echo const QString GIT_REVISION=\"$GIT_REVISION\"\; >> $DIR/git_info.h
+echo // This is an auto generated file > $DIR/git_info.h.new
+echo const QString GIT_BRANCH=\"$GIT_BRANCH\"\; >> $DIR/git_info.h.new
+echo const QString GIT_REVISION=\"$GIT_REVISION\"\; >> $DIR/git_info.h.new
+
+if diff $DIR/git_info.h $DIR/git_info.h.new &> /dev/null; then
+    rm $DIR/git_info.h.new
+else
+    echo Updating $DIR/git_info.h
+    mv $DIR/git_info.h.new $DIR/git_info.h
+fi