robust update patch

2023-07-25 12:35:42 +09:00
parent c0164cc7cd
commit f534cf27e6
5 changed files with 20 additions and 8 deletions
--- a/init.py
+++ b/init.py
@@ -32,7 +32,7 @@ sys.path.append('../..')
 from torchvision.datasets.utils import download_url

 # ensure .js
-print("### Loading: ComfyUI-Manager (V0.14)")
+print("### Loading: ComfyUI-Manager (V0.15)")

 comfy_ui_revision = "Unknown"

@@ -183,8 +183,11 @@ def git_pull(path):
        return __win_check_git_pull(path)
    else:
        repo = git.Repo(path)
+        if repo.is_dirty():
+            repo.git.stash()
+
        origin = repo.remote(name='origin')
-        origin.pull()
+        origin.pull(rebase=True)
        repo.git.submodule('update', '--init', '--recursive')
        
        repo.close()