commit 68ee4b799febb66cd95be82cc76f1667cd306d07
author Dhruv Srivastava <dhruvsri@google.com> Mon Feb 22 10:07:42 2021 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Feb 22 10:07:42 2021 +0000
tree 7270e20558b1ad7b8d998a8dc0a38497d9f7b8cb
parent 64b11c73ea11bbfb122ccb47cb84caa60de1c662
parent 9f65d91c035bc9ef591f8833b1b696d272372de9

Merge "Add readonly to restApiService property"

java/com/google/gerrit/server/query/change/ChangeData.java

diff --git a/java/com/google/gerrit/server/query/change/ChangeData.java b/java/com/google/gerrit/server/query/change/ChangeData.java
index 05ecc61..eb76f5d 100644
--- a/java/com/google/gerrit/server/query/change/ChangeData.java
+++ b/java/com/google/gerrit/server/query/change/ChangeData.java
@@ -600,6 +600,7 @@
       author = c.getAuthorIdent();
       committer = c.getCommitterIdent();
       parentCount = c.getParentCount();
+      merge = parentCount > 0;
     } catch (IOException e) {
       throw new StorageException(
           String.format(
@@ -961,7 +962,7 @@
         return null;
       }
     }
-    return parentCount > 1;
+    return merge;
   }
 
   public Set<Account.Id> editsByUser() {