From f97fe52d2b1e492bc54b61188fa28a0ee3623afb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jakobus=20Sch=C3=BCrz?= <jakobus.schuerz@home.arpa>
Date: Fri, 21 Oct 2022 10:50:14 +0200
Subject: [PATCH] change variable-name

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

diff --git a/bin/git-myshellconfig-checkout b/bin/git-myshellconfig-checkout
index a84e9de..5613899 100755
--- a/bin/git-myshellconfig-checkout
+++ b/bin/git-myshellconfig-checkout
@@ -105,11 +105,8 @@ 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; }
-        if  ${dosubmodupdate:+false}; then
-            $SGIT submodule update --init --recursive
-        fi
+        $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; }
         touch $MSC_GIT_UPD_REPO_STATFILE
     else
         logwarning -n "    Lokale Änderungen festgestellt:"