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

Fix update_gitinfo to detect detached head state properly.

Browse Source
This commit is contained in:
sawinglogz 2020-01-17 16:19:13 -05:00
parent 796f4659ab
commit 79ec192051
2 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
oscar/update_gitinfo.bat
View File

@ -5,6 +5,7 @@ cd %DIR%
if ('git rev-parse --git-dir') ( 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 --abbrev-ref HEAD') do set GIT_BRANCH=%%i
if "%GIT_BRANCH"=="HEAD" set GIT_BRANCH=""
for /f %%i in ('git rev-parse --short HEAD') do set GIT_REVISION=%%i for /f %%i in ('git rev-parse --short HEAD') do set GIT_REVISION=%%i
if ('git diff-index --quiet HEAD --') ( if ('git diff-index --quiet HEAD --') (
set GIT_REVISION=%GIT_REVISION%-plus set GIT_REVISION=%GIT_REVISION%-plus

1
oscar/update_gitinfo.sh
View File

@ -6,6 +6,7 @@ cd $DIR
git rev-parse --git-dir &>/dev/null git rev-parse --git-dir &>/dev/null
if [ $? -eq 0 ]; then if [ $? -eq 0 ]; then
GIT_BRANCH=`git rev-parse --abbrev-ref HEAD` GIT_BRANCH=`git rev-parse --abbrev-ref HEAD`
[ "$GIT_BRANCH" == "HEAD" ] && GIT_BRANCH="" # not really a branch
GIT_REVISION=`git rev-parse --short HEAD` GIT_REVISION=`git rev-parse --short HEAD`
$(git diff-index --quiet HEAD --) $(git diff-index --quiet HEAD --)
if [ $? -ne 0 ]; then if [ $? -ne 0 ]; then