From 71c05c46257d15f864fa7659281db3d57eda17c2 Mon Sep 17 00:00:00 2001
From: sawinglogz <3787776-sawinglogz@users.noreply.gitlab.com>
Date: Tue, 7 May 2019 16:50:58 -0400
Subject: [PATCH] Change the current working directory instead of using
 --work-dir.

It was previously working in a false-positive state, where it would behave as
expected if you ran "make" from within a subdirectory of the git repo. If you
ran make anywhere else, at least diff-index would break.
---
 oscar/update_gitinfo.bat | 7 ++++---
 oscar/update_gitinfo.sh  | 6 +++---
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/oscar/update_gitinfo.bat b/oscar/update_gitinfo.bat
index 9ffd20b8..dee9e797 100755
--- a/oscar/update_gitinfo.bat
+++ b/oscar/update_gitinfo.bat
@@ -1,10 +1,11 @@
 @echo off
 setlocal
 set DIR=%~dp0
+cd %DIR%
 
-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 || set GIT_REVISION=%GIT_REVISION%+
+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%+
 
 if "%GIT_BRANCH"=="" set GIT_BRANCH="Unknown"
 if "%GIT_REVISION"=="" set GIT_REVISION="Unknown"
diff --git a/oscar/update_gitinfo.sh b/oscar/update_gitinfo.sh
index 909ac299..daaab8fb 100755
--- a/oscar/update_gitinfo.sh
+++ b/oscar/update_gitinfo.sh
@@ -3,9 +3,9 @@
 DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 cd $DIR
 
-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)
+GIT_BRANCH=`git rev-parse --abbrev-ref HEAD`
+GIT_REVISION=`git rev-parse --short HEAD`
+$(git diff-index --quiet HEAD --)
 if [ $? -ne 0 ]; then
     GIT_REVISION="$GIT_REVISION+"  # uncommitted changes
 fi