diff --git a/bin/git-myshellconfig-checkout b/bin/git-myshellconfig-checkout index f7a6041..b5e3a99 100755 --- a/bin/git-myshellconfig-checkout +++ b/bin/git-myshellconfig-checkout @@ -104,10 +104,10 @@ if $dorepoupdate; then no changes in local repo $MSC_GIT checkout ${PRE}${PRE:+/}${MSC_GIT_BRANCH} EOF - $SGIT 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 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; } if ${dosubmodupdate:+false}; then - $SGIT submodule update --init --recursive + $MSC_GIT submodule update --init --recursive fi touch $MSC_GIT_UPD_REPO_STATFILE else