jakob/myshellconfig
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

add submodule handling

Browse source
This commit is contained in:
Jakobus Schürz 2022-10-11 14:50:49 +02:00 committed by Jakobus Schürz
parent f97fe52d2b
commit b73aa189a9
1 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
bin/git-myshellconfig-checkout
View file

@ -105,8 +105,11 @@ if $dorepoupdate; then
no changes in local repo no changes in local repo
$MSC_GIT checkout ${PRE}${PRE:+/}${MSC_GIT_BRANCH} $MSC_GIT checkout ${PRE}${PRE:+/}${MSC_GIT_BRANCH}
EOF EOF
$MSC_GIT checkout ${PRE}${PRE:+/}${MSC_GIT_BRANCH} 1>>"${MSC_LOGFILE}" 2>>"${MSC_LOGFILE}"|| { gitupdateend; exit 2; } $SGIT checkout ${PRE}${PRE:+/}${MSC_GIT_BRANCH} 1>>"${MSC_LOGFILE}" 2>>"${MSC_LOGFILE}"|| { gitupdateend; exit 2; }
$MSC_GIT merge FETCH_HEAD 1>>"${MSC_LOGFILE}" 2>>"${MSC_LOGFILE}"|| { gitupdateend; exit 3; } $SGIT merge FETCH_HEAD 1>>"${MSC_LOGFILE}" 2>>"${MSC_LOGFILE}"|| { gitupdateend; exit 3; }
if ${dosubmodupdate:+false}; then
$SGIT submodule update --init --recursive
fi
touch $MSC_GIT_UPD_REPO_STATFILE touch $MSC_GIT_UPD_REPO_STATFILE
else else
logwarning -n " Lokale Änderungen festgestellt:" logwarning -n " Lokale Änderungen festgestellt:"