feat: remove more git locks

BoYanZh · Nov 19, 2024 · 3550042 · 3550042
1 parent 3f8d7af
commit 3550042
Showing 1 changed file with 6 additions and 4 deletions.
diff --git a/joint_teapot/workers/git.py b/joint_teapot/workers/git.py
@@ -85,10 +85,12 @@ def repo_clean_and_checkout(
         retry_interval = 2
         while retry_interval and auto_retry:
             try:
-                if clean_git_lock and os.path.exists(
-                    os.path.join(repo_dir, ".git/index.lock")
-                ):
-                    os.remove(os.path.join(repo_dir, ".git/index.lock"))
+                if clean_git_lock:
+                    lock_files = ["index.lock", "HEAD.lock", "fetch-pack.lock"]
+                    for lock_file in lock_files:
+                        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.reset("--hard", "origin/master")
                 repo.git.clean("-d", "-f", "-x")