From 8e91248655acf1c8044ed8c1b265b804a99eb07f Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Wed, 26 Jan 2022 04:03:34 -0500 Subject: [PATCH] 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 Reviewed-by: Peter Kjellerstedt Reviewed-by: Mike Frysinger --- project.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/project.py b/project.py index 12257857..41e81d1f 100644 --- a/project.py +++ b/project.py @@ -2820,7 +2820,8 @@ class Project(object): } # 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.