commit acc4c857a0b6e2e33e3647028cbd312498fd5900
author LaMont Jones <lamontjones@google.com> Thu Sep 22 19:05:01 2022 +0000
committer LaMont Jones <lamontjones@google.com> Thu Sep 22 19:18:48 2022 +0000
tree 1638467a6a312a9aadd6d15b41ef8f9366e9c788
parent a39af3d4322135202aabfc78cc65809a28a4ca75

sync: only use --cruft when git supports it.

git gc --cruft was added in 2.37.0.

Bug: https://crbug.com/gerrit/16270
Change-Id: I71e46741e33472a92f16d6f11c51a23e1e55d869
Reviewed-on: https://gerrit-review.googlesource.com/c/git-repo/+/346577
Reviewed-by: Emily Shaffer <emilyshaffer@google.com>
Tested-by: LaMont Jones <lamontjones@google.com>
Reviewed-by: Mike Frysinger <vapier@google.com>

subcmds/sync.py

diff --git a/subcmds/sync.py b/subcmds/sync.py
index 1c49b46..5818b45 100644
--- a/subcmds/sync.py
+++ b/subcmds/sync.py
@@ -800,7 +800,11 @@
 
     jobs = opt.jobs
 
-    gc_args = ('--auto', '--cruft')
+    gc_args = ['--auto']
+    backup_cruft = False
+    if git_require((2, 37, 0)):
+      gc_args.append('--cruft')
+      backup_cruft = True
     pack_refs_args = ()
     if jobs < 2:
       for (run_gc, bare_git) in tidy_dirs.values():
@@ -810,7 +814,8 @@
           bare_git.gc(*gc_args)
         else:
           bare_git.pack_refs(*pack_refs_args)
-        self._backup_cruft(bare_git)
+        if backup_cruft:
+          self._backup_cruft(bare_git)
       pm.end()
       return
 
@@ -834,7 +839,8 @@
           err_event.set()
           raise
       finally:
-        self._backup_cruft(bare_git)
+        if backup_cruft:
+          self._backup_cruft(bare_git)
         pm.finish(bare_git._project.name)
         sem.release()