Disable saving auto-merge commits
If an auto-merge is not available yet, it needs to be created. Saving it
means doing a write in Git. The changed files computation is often done
in read requests, and doing a Git write in a read request is bad. Hence
it's better to disable saving auto-merges, even if it means that it
needs to be recomputed later again.
Signed-off-by: Edwin Kempin <ekempin@google.com>
Change-Id: I2ecce2a86b8fd403e3c1dec8fab7dd301f21cb74
diff --git a/java/com/google/gerrit/plugins/codeowners/backend/ChangedFiles.java b/java/com/google/gerrit/plugins/codeowners/backend/ChangedFiles.java
index 2f34306..c19358c 100644
--- a/java/com/google/gerrit/plugins/codeowners/backend/ChangedFiles.java
+++ b/java/com/google/gerrit/plugins/codeowners/backend/ChangedFiles.java
@@ -70,7 +70,6 @@
private final Provider<AutoMerger> autoMergerProvider;
private final CodeOwnerMetrics codeOwnerMetrics;
private final ThreeWayMergeStrategy mergeStrategy;
- private final boolean saveAutoMergeCommits;
@Inject
public ChangedFiles(
@@ -84,7 +83,6 @@
this.autoMergerProvider = autoMergerProvider;
this.codeOwnerMetrics = codeOwnerMetrics;
this.mergeStrategy = MergeUtil.getMergeStrategy(cfg);
- this.saveAutoMergeCommits = AutoMerger.cacheAutomerge(cfg);
}
/**
@@ -169,10 +167,7 @@
throws IOException {
try (Timer0.Context ctx = codeOwnerMetrics.getAutoMerge.start();
Repository repository = repoManager.openRepository(project);
- ObjectInserter inserter =
- saveAutoMergeCommits
- ? repository.newObjectInserter()
- : new InMemoryInserter(repository);
+ ObjectInserter inserter = new InMemoryInserter(repository);
ObjectReader reader = inserter.newReader();
RevWalk revWalk = new RevWalk(reader)) {
return autoMergerProvider
