diff --git a/bin/git-myshellconfig-checkout b/bin/git-myshellconfig-checkout index 5613899..a84e9de 100755 --- a/bin/git-myshellconfig-checkout +++ b/bin/git-myshellconfig-checkout @@ -105,8 +105,11 @@ if $dorepoupdate; then no changes in local repo $MSC_GIT checkout ${PRE}${PRE:+/}${MSC_GIT_BRANCH} EOF - $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; } + $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; } + if ${dosubmodupdate:+false}; then + $SGIT submodule update --init --recursive + fi touch $MSC_GIT_UPD_REPO_STATFILE else logwarning -n " Lokale Ă„nderungen festgestellt:"