commit 8e91248655acf1c8044ed8c1b265b804a99eb07f
author Mike Frysinger <vapier@google.com> Wed Jan 26 04:03:34 2022 -0500
committer Mike Frysinger <vapier@google.com> Wed Jan 26 16:46:03 2022 +0000
tree e2bf07e88a139298776035c71ff0a8dc8226f078
parent 630876f9e4910a4c91705c6cc98414123547419a

project: mark gc.log as safe to discard when migrating .git/

This is just a log file that, while useful for humans when gc aborts,
doesn't contain any data, so it's safe to throw away.

Bug: https://crbug.com/gerrit/15619
Change-Id: Ia95e0e281f52260668f7a80b5d5f990e32a8597a
Reviewed-on: https://gerrit-review.googlesource.com/c/git-repo/+/328999
Tested-by: Mike Frysinger <vapier@google.com>
Reviewed-by: Peter Kjellerstedt <peter.kjellerstedt@axis.com>
Reviewed-by: Mike Frysinger <vapier@google.com>

project.py

diff --git a/project.py b/project.py
index 1225785..41e81d1 100644
--- a/project.py
+++ b/project.py
@@ -2820,7 +2820,8 @@
     }
     # Paths that we know will be in both, but are safe to clobber in .repo/projects/.
     SAFE_TO_CLOBBER = {
-        'COMMIT_EDITMSG', 'FETCH_HEAD', 'HEAD', 'gitk.cache', 'index', 'ORIG_HEAD',
+        'COMMIT_EDITMSG', 'FETCH_HEAD', 'HEAD', 'gc.log', 'gitk.cache', 'index',
+        'ORIG_HEAD',
     }
 
     # First see if we'd succeed before starting the migration.