From ae95d3ec8d201ceaa7d9eda76cae8b603fb4f194 Mon Sep 17 00:00:00 2001
From: Vladimir Mandic <mandic00@live.com>
Date: Wed, 22 May 2024 08:00:06 -0400
Subject: [PATCH] fix installer git ops

---
 extensions-builtin/sdnext-modernui |  2 +-
 installer.py                       | 14 ++++----------
 2 files changed, 5 insertions(+), 11 deletions(-)

diff --git a/extensions-builtin/sdnext-modernui b/extensions-builtin/sdnext-modernui
index 258d613ee..71cc49ea2 160000
--- a/extensions-builtin/sdnext-modernui
+++ b/extensions-builtin/sdnext-modernui
@@ -1 +1 @@
-Subproject commit 258d613ee3b888bfb8d19c44ef0c503f1febe42c
+Subproject commit 71cc49ea2434cce011ff21089a8cb394cd74a959
diff --git a/installer.py b/installer.py
index fce9ecbb0..3d5f73867 100644
--- a/installer.py
+++ b/installer.py
@@ -800,15 +800,9 @@ def install_submodules(force=True):
     log.info('Verifying submodules')
     txt = git('submodule')
     # log.debug(f'Submodules list: {txt}')
-    if force and 'no submodule mapping found' in txt and 'sd-webui-controlnet' not in txt:
-        log.warning('Attempting repository recover')
-        git('add .')
-        git('stash')
-        git('merge --abort', folder=None, ignore=True)
-        git('fetch --all')
-        git('reset --hard origin/master')
-        git('checkout master')
+    if force and 'no submodule mapping found' in txt and 'extension-builtin' not in txt:
         txt = git('submodule')
+        git_reset()
         log.info('Continuing setup')
     git('submodule --quiet update --init --recursive')
     git('submodule --quiet sync --recursive')
@@ -1111,11 +1105,11 @@ def extensions_preload(parser):
         print_profile(pr, 'Preload')
 
 
-def git_reset():
+def git_reset(folder='.'):
     log.warning('Running GIT reset')
     global quick_allowed # pylint: disable=global-statement
     quick_allowed = False
-    b = branch('.')
+    b = branch(folder)
     if b is None or b == '':
         b = 'master'
     git('add .')