arthurcai/Joint-Teapot
2
0
Fork 0
forked from JOJ/Joint-Teapot
Code Pull Requests Activity

feat: remove more git locks

Browse Source
This commit is contained in:
张泊明518370910136 2024-11-19 07:10:54 -05:00
parent 3f8d7af725
commit 3550042c8e
Signed by untrusted user: 张泊明518370910136
GPG Key ID: CA088E6D9284F870
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
joint_teapot/workers/git.py
View File

@ -85,10 +85,12 @@ class Git:
retry_interval = 2 retry_interval = 2
while retry_interval and auto_retry: while retry_interval and auto_retry:
try: try:
if clean_git_lock and os.path.exists( if clean_git_lock:
os.path.join(repo_dir, ".git/index.lock") lock_files = ["index.lock", "HEAD.lock", "fetch-pack.lock"]
): for lock_file in lock_files:
os.remove(os.path.join(repo_dir, ".git/index.lock")) lock_path = os.path.join(repo_dir, ".git", lock_file)
if os.path.exists(lock_path):
os.remove(lock_path)
repo.git.fetch("--tags", "--all", "-f") repo.git.fetch("--tags", "--all", "-f")
repo.git.reset("--hard", "origin/master") repo.git.reset("--hard", "origin/master")
repo.git.clean("-d", "-f", "-x") repo.git.clean("-d", "-f", "-x")