From b73aa189a9712dc97c9d0e20a5c1d0032c07e2e4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jakobus=20Sch=C3=BCrz?= <schuer4@bmi.intra.gv.at>
Date: Tue, 11 Oct 2022 14:50:49 +0200
Subject: [PATCH] add submodule handling

---
 bin/git-myshellconfig-checkout | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

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:"