chris/OSCAR-code
1
0
Fork 0
mirror of https://gitlab.com/pholy/OSCAR-code.git synced 2025-04-06 03:00:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

Change the current working directory instead of using --work-dir.

Browse Source 
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.
This commit is contained in:
sawinglogz 2019-05-07 16:50:58 -04:00
parent a458fdfad6
commit 71c05c4625
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
oscar/update_gitinfo.bat
View File

@ -1,10 +1,11 @@
@echo off @echo off
setlocal setlocal
set DIR=%~dp0 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 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 for /f %%i in ('git rev-parse --short HEAD') do set GIT_REVISION=%%i
git --work-tree %DIR% diff-index --quiet HEAD || set GIT_REVISION=%GIT_REVISION%+ git diff-index --quiet HEAD -- || set GIT_REVISION=%GIT_REVISION%+
if "%GIT_BRANCH"=="" set GIT_BRANCH="Unknown" if "%GIT_BRANCH"=="" set GIT_BRANCH="Unknown"
if "%GIT_REVISION"=="" set GIT_REVISION="Unknown" if "%GIT_REVISION"=="" set GIT_REVISION="Unknown"

6
oscar/update_gitinfo.sh
View File

@ -3,9 +3,9 @@
DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
cd $DIR cd $DIR
GIT_BRANCH=`git --work-tree $DIR rev-parse --abbrev-ref HEAD` GIT_BRANCH=`git rev-parse --abbrev-ref HEAD`
GIT_REVISION=`git --work-tree $DIR rev-parse --short HEAD` GIT_REVISION=`git rev-parse --short HEAD`
$(git --work-tree $DIR diff-index --quiet HEAD) $(git diff-index --quiet HEAD --)
if [ $? -ne 0 ]; then if [ $? -ne 0 ]; then
GIT_REVISION="$GIT_REVISION+" # uncommitted changes GIT_REVISION="$GIT_REVISION+" # uncommitted changes
fi fi