JOJ/Joint-Teapot
13
3
Fork 2
Code Issues 2 Pull Requests 1 Actions Packages Projects Releases Wiki Activity

fix: remove more locks
All checks were successful
build / trigger-build-image (push) Successful in 14s
Details

Browse Source
This commit is contained in:
张泊明518370910136 2025-06-08 22:43:11 -04:00
parent 65a8a5d130
commit 2c1123892c
Signed by: 张泊明518370910136
GPG Key ID: CA088E6D9284F870
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
joint_teapot/workers/git.py
View File

@ -90,6 +90,11 @@ class Git:
retry_interval = 2 retry_interval = 2
while retry_interval and auto_retry: while retry_interval and auto_retry:
try: try:
current_branch = ""
if repo.head.is_detached:
current_branch = repo.head.commit.hexsha
else:
current_branch = repo.active_branch.name
if clean_git_lock: if clean_git_lock:
lock_files = [ lock_files = [
"index.lock", "index.lock",
@ -98,7 +103,7 @@ class Git:
"logs/HEAD.lock", "logs/HEAD.lock",
"packed-refs.lock", "packed-refs.lock",
"config.lock", "config.lock",
f"{checkout_dest}.lock", f"refs/remotes/origin/{current_branch}.lock",
] ]
for lock_file in lock_files: for lock_file in lock_files:
lock_path = os.path.join(repo_dir, ".git", lock_file) lock_path = os.path.join(repo_dir, ".git", lock_file)