commit 779158fe23b95fbac123a6b56513b2bec9773721
author Maxime Guerreiro <maximeg@google.com> Thu Jun 28 09:02:52 2018 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Jun 28 09:02:52 2018 +0000
tree 36d8df9a90171794fab12723e139638425d24416
parent 2fa79b21eee84622ec17b506c6acfc7eba45d88e
parent 91903a90b9a8ce3f119ea5a255740eae1439f0ff

Merge "Reuse the ObjectInserter in PureRevert to get a new reader"

java/com/google/gerrit/server/change/PureRevert.java

diff --git a/java/com/google/gerrit/server/change/PureRevert.java b/java/com/google/gerrit/server/change/PureRevert.java
index ee0e2cc..2c450a7 100644
--- a/java/com/google/gerrit/server/change/PureRevert.java
+++ b/java/com/google/gerrit/server/change/PureRevert.java
@@ -117,7 +117,7 @@
       // Any differences between claimed original's parent and the rebase result indicate that the
       // claimedRevert is not a pure revert but made content changes
       try (DiffFormatter df = new DiffFormatter(new ByteArrayOutputStream())) {
-        df.setRepository(repo);
+        df.setReader(oi.newReader(), repo.getConfig());
         List<DiffEntry> entries =
             df.scan(claimedOriginalCommit.getParent(0), merger.getResultTreeId());
         return new PureRevertInfo(entries.isEmpty());