ChangeKindCacheImpl: Assume REWORK if we hit LargeObjectException

Change-Id: I0fd752fdc7e2c35987a94afe83fc524c240d20db
(cherry picked from commit 75f39623296d6efdffb5adf4b948ed8574651586)

1 files changed, 10 insertions, 5 deletions

diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/change/ChangeKindCacheImpl.java b/gerrit-server/src/main/java/com/google/gerrit/server/change/ChangeKindCacheImpl.java
index 23039aa486..a2b78aaebc 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/change/ChangeKindCacheImpl.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/change/ChangeKindCacheImpl.java
@@ -38,6 +38,7 @@ import com.google.inject.Module;
 import com.google.inject.Singleton;
 import com.google.inject.name.Named;
 
+import org.eclipse.jgit.errors.LargeObjectException;
 import org.eclipse.jgit.lib.Config;
 import org.eclipse.jgit.lib.ObjectId;
 import org.eclipse.jgit.lib.Repository;
@@ -218,12 +219,16 @@ public class ChangeKindCacheImpl implements ChangeKindCache {
         ThreeWayMerger merger = MergeUtil.newThreeWayMerger(
             key.repo, MergeUtil.createDryRunInserter(key.repo), key.strategyName);
         merger.setBase(prior.getParent(0));
-        if (merger.merge(next.getParent(0), prior)
-            && merger.getResultTreeId().equals(next.getTree())) {
-          return ChangeKind.TRIVIAL_REBASE;
-        } else {
-          return ChangeKind.REWORK;
+        try {
+          if (merger.merge(next.getParent(0), prior)
+              && merger.getResultTreeId().equals(next.getTree())) {
+            return ChangeKind.TRIVIAL_REBASE;
+          }
+        } catch (LargeObjectException e) {
+          // Some object is too large for the merge attempt to succeed. Assume
+          // it was a rework.
         }
+        return ChangeKind.REWORK;
       } finally {
         key.repo = null;
       }