Merge branch 'master' of bmi-desktop:/srv/git/myshellconfig

This commit is contained in:
Jakobus Schürz 2020-10-28 09:51:15 +01:00
commit efec3b6bcb

View file

@ -100,6 +100,7 @@ logdebug "update submodules"
#$SGIT submodule foreach "git checkout master" 1>>"${MYSHELLCONFIG_LOGFILE}" 2>&1 || { logwarn "checkout master submodules failed on set upstream"; rc=7; }
#$SGIT submodule foreach "git branch -u origin/master master" 1>>"${MYSHELLCONFIG_LOGFILE}" 2>&1|| { logwarn "set-upstream submodules failed on set upstream"; rc=8; }
$SGIT submodule update --init --recursive --remote --merge 1>>"${MYSHELLCONFIG_LOGFILE}" 2>&1 || { logwarn " update submodules failed on update"; rc=9; }
$SGIT checkout .gitmodules
logdebug "submodules updated successfully" >&2
else