YanWenKun / ComfyUI-Windows-Portable

🎨ComfyUI standalone pack with 30+ custom nodes. | ComfyUI 大号整合包,预装大量自定义节点(不含SD模型)
GNU General Public License v3.0
132 stars 17 forks source link

Unable to update ComfyUI #11

Closed ChrisTheDBA closed 1 month ago

ChrisTheDBA commented 2 months ago

On the 7/28 release.

using update_comfyui.bat

Traceback (most recent call last):
  File "D:\comfyui2\comfyui_windows_portable\update\update.py", line 76, in <module>
    pull(repo)
  File "D:\comfyui2\comfyui_windows_portable\update\update.py", line 13, in pull
    merge_result, _ = repo.merge_analysis(remote_master_id)
                      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
_pygit2.GitError: object not found - no match for id (f82d09c9b40fd9ebbc080bc5662ddb39787b1ec9)

Using GUI:

Update ComfyUI
Cmd('git') failed due to: exit code(128)
  cmdline: git pull -v -- origin
  stderr: 'error: Could not read f82d09c9b40fd9ebbc080bc5662ddb39787b1ec9
error: Could not read f82d09c9b40fd9ebbc080bc5662ddb39787b1ec9
error: Could not read f82d09c9b40fd9ebbc080bc5662ddb39787b1ec9
error: Could not read f82d09c9b40fd9ebbc080bc5662ddb39787b1ec9
fatal: refusing to merge unrelated histories'
CUSTOM NODE PULL: Fail
YanWenKun commented 2 months ago

This is caused by merge conflict, possibly related to the commit node of ComfyUI (e.g. force-push that overwrites exist commits). I will add a force-update script in the future for situation like this.

For now, you can force update ComfyUI using this method (via cmd/powershell/git bash):

cd PATH\TO\ComfyUI
git pull --force
7nhdung commented 2 months ago

Error_Updating_ComfyUI_YanWenKun

Sorry! I get the same problem when run update_comfyui.bat. And when I follow your instruction: in the ComfyUI directory, I type git pull --force > and it displays an error: Could not read ....... Could not parse commit ..... .(error screenshot include).

Please help me. Thanks advance

YanWenKun commented 1 month ago

@7nhdung Try this:

git fetch --unshallow

Then

git pull --force
ChrisTheDBA commented 1 month ago

since we have a new version, this can be closed.

ChrisTheDBA commented 1 month ago

Can I close it?