Skip to content

The most powerful and modular diffusion model GUI, api and backend with a graph/nodes interface. The fastest local inference engine in the world.

Make portable updater work with repos in unmerged state. (#11281)

comfyanonymous338d9ae3bbf2
diff --git a/.ci/update_windows/update.py b/.ci/update_windows/update.py
index 59ece5130..fe646a6ed 100755
--- a/.ci/update_windows/update.py
+++ b/.ci/update_windows/update.py
@@ -53,6 +53,16 @@ try:
repo.stash(ident)
except KeyError:
print("nothing to stash") # noqa: T201
+except:
+ print("Could not stash, cleaning index and trying again.") # noqa: T201
+ repo.state_cleanup()
+ repo.index.read_tree(repo.head.peel().tree)
+ repo.index.write()
+ try:
+ repo.stash(ident)
+ except KeyError:
+ print("nothing to stash.") # noqa: T201
+
backup_branch_name = 'backup_branch_{}'.format(datetime.today().strftime('%Y-%m-%d_%H_%M_%S'))
print("creating backup branch: {}".format(backup_branch_name)) # noqa: T201
try: