opendev/gerrit
Code Issues Proposed changes

Use Collections.addAll to copy all parents to mergedParents

Browse Source 
Change-Id: I5186e24afa68d65ba996fd8813153e0444982548
This commit is contained in:
Shawn Pearce
2016-09-02 13:59:34 -07:00
parent aae47baccb
commit 3551dc0456
1 changed files with 1 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
gerrit-server/src/main/java/com/google/gerrit/server/git/ReceiveCommits.java
View File

@@ -1689,9 +1689,7 @@ public class ReceiveCommits {
Collection<Ref> existingRefs = existing.get(c);
if (rejectImplicitMerges) {
for (RevCommit p : c.getParents()) {
mergedParents.add(p);
}
Collections.addAll(mergedParents, c.getParents());
mergedParents.remove(c);
}