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

change from SGIT to MSC_GIT

Browse source
This commit is contained in:
Jakobus Schürz 2022-10-25 07:08:19 +02:00
parent 21c57cbfb1
commit 4e21ee9c70
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
bin/git-myshellconfig-checkout
View file

@ -104,10 +104,10 @@ 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
$SGIT checkout ${PRE}${PRE:+/}${MSC_GIT_BRANCH} 1>>"${MSC_LOGFILE}" 2>>"${MSC_LOGFILE}"|| { gitupdateend; exit 2; } $MSC_GIT checkout ${PRE}${PRE:+/}${MSC_GIT_BRANCH} 1>>"${MSC_LOGFILE}" 2>>"${MSC_LOGFILE}"|| { gitupdateend; exit 2; }
$SGIT merge FETCH_HEAD 1>>"${MSC_LOGFILE}" 2>>"${MSC_LOGFILE}"|| { gitupdateend; exit 3; } $MSC_GIT merge FETCH_HEAD 1>>"${MSC_LOGFILE}" 2>>"${MSC_LOGFILE}"|| { gitupdateend; exit 3; }
if ${dosubmodupdate:+false}; then if ${dosubmodupdate:+false}; then
$SGIT submodule update --init --recursive $MSC_GIT submodule update --init --recursive
fi fi
touch $MSC_GIT_UPD_REPO_STATFILE touch $MSC_GIT_UPD_REPO_STATFILE
else else