wangbo/ComfyUI-Manager
1
0
Fork 0
mirror of https://github.com/Comfy-Org/ComfyUI-Manager.git synced 2025-12-16 18:02:58 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

fixed: switch_to_default_branch - robust patch

Browse Source 
https://github.com/ltdrdata/ComfyUI-Manager/issues/1392#issuecomment-2569675066
This commit is contained in:
Dr.Lt.Data 2025-01-04 09:48:56 +09:00
parent 4dee009d51
commit faf1209eba
3 changed files with 24 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
git_helper.py
View File

@ -127,8 +127,17 @@ def gitcheck(path, do_fetch=False):
def switch_to_default_branch(repo): def switch_to_default_branch(repo):
default_branch = repo.git.symbolic_ref('refs/remotes/origin/HEAD').replace('refs/remotes/origin/', '') try:
repo.git.checkout(default_branch) default_branch = repo.git.symbolic_ref('refs/remotes/origin/HEAD').replace('refs/remotes/origin/', '')
repo.git.checkout(default_branch)
except:
try:
repo.git.checkout(repo.heads.master)
except:
try:
repo.git.checkout(repo.heads.main)
except:
print("[ComfyUI Manager] Failed to switch to the default branch (master or main)")
def gitpull(path): def gitpull(path):

15
glob/manager_core.py
View File

@ -36,7 +36,7 @@ import manager_downloader
from node_package import InstalledNodePackage from node_package import InstalledNodePackage
version_code = [3, 3, 8] version_code = [3, 3, 9]
version_str = f"V{version_code[0]}.{version_code[1]}" + (f'.{version_code[2]}' if len(version_code) > 2 else '') version_str = f"V{version_code[0]}.{version_code[1]}" + (f'.{version_code[2]}' if len(version_code) > 2 else '')
@ -1510,8 +1510,17 @@ def get_config():
def switch_to_default_branch(repo): def switch_to_default_branch(repo):
default_branch = repo.git.symbolic_ref('refs/remotes/origin/HEAD').replace('refs/remotes/origin/', '') try:
repo.git.checkout(default_branch) default_branch = repo.git.symbolic_ref('refs/remotes/origin/HEAD').replace('refs/remotes/origin/', '')
repo.git.checkout(default_branch)
except:
try:
repo.git.checkout(repo.heads.master)
except:
try:
repo.git.checkout(repo.heads.main)
except:
print("[ComfyUI Manager] Failed to switch to the default branch (master or main)")
def try_install_script(url, repo_path, install_cmd, instant_execution=False): def try_install_script(url, repo_path, install_cmd, instant_execution=False):

2
pyproject.toml
View File

@ -1,7 +1,7 @@
[project] [project]
name = "comfyui-manager" name = "comfyui-manager"
description = "ComfyUI-Manager provides features to install and manage custom nodes for ComfyUI, as well as various functionalities to assist with ComfyUI." description = "ComfyUI-Manager provides features to install and manage custom nodes for ComfyUI, as well as various functionalities to assist with ComfyUI."
version = "3.3.8" version = "3.3.9"
license = { file = "LICENSE.txt" } license = { file = "LICENSE.txt" }
dependencies = ["GitPython", "PyGithub", "matrix-client==0.4.0", "transformers", "huggingface-hub>0.20", "typer", "rich", "typing-extensions"] dependencies = ["GitPython", "PyGithub", "matrix-client==0.4.0", "transformers", "huggingface-hub>0.20", "typer", "rich", "typing-extensions"]