project: Speculative fix for project corruption
When a new shared project is added to manifest, there's a short window
where objects can be deleted that are used by other projects.
To close that window, set preciousObjects during git init. For
non-shared projects, repo should correct the state in the same execution
instance.
Bug: 288102993
Change-Id: I366f524535ac58c820d51a88599ae2108df9ab48
Reviewed-on: https://gerrit-review.googlesource.com/c/git-repo/+/390234
Commit-Queue: Josip Sokcevic <sokcevic@google.com>
Tested-by: Josip Sokcevic <sokcevic@google.com>
Reviewed-by: Mike Frysinger <vapier@google.com>
diff --git a/project.py b/project.py
index be53def..7b78427 100644
--- a/project.py
+++ b/project.py
@@ -2990,6 +2990,17 @@
self.config.SetBoolean(
"core.bare", True if self.manifest.IsMirror else None
)
+
+ if not init_obj_dir:
+ # The project might be shared (obj_dir already initialized), but
+ # such information is not available here. Instead of passing it,
+ # set it as shared, and rely to be unset down the execution
+ # path.
+ if git_require((2, 7, 0)):
+ self.EnableRepositoryExtension("preciousObjects")
+ else:
+ self.config.SetString("gc.pruneExpire", "never")
+
except Exception:
if init_obj_dir and os.path.exists(self.objdir):
platform_utils.rmtree(self.objdir)
diff --git a/subcmds/sync.py b/subcmds/sync.py
index 8460bce..48ceb46 100644
--- a/subcmds/sync.py
+++ b/subcmds/sync.py
@@ -1129,8 +1129,6 @@
)
project.config.SetString("gc.pruneExpire", "never")
else:
- if not opt.quiet:
- print(f"\r{relpath}: not shared, disabling pruning.")
project.config.SetString("extensions.preciousObjects", None)
project.config.SetString("gc.pruneExpire", None)
