commit | faf830b3b80e970f517865039fb403281aa411ae | [log] [tgz] |
---|---|---|
author | Han-Wen Nienhuys <hanwen@google.com> | Wed Feb 17 18:16:15 2021 +0100 |
committer | Han-Wen Nienhuys <hanwen@google.com> | Thu Feb 18 10:21:13 2021 +0100 |
tree | 48d4a1b7a807946a2e5aa8caa76121434d4d5aed | |
parent | 9b1e075368ee8d74b7342893da48fac0be39e000 [diff] |
ChangeData: use the 'merge' variable Change-Id: I9967951930e9ed3a3b9bb187401499103e1263f2
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() {