opendev/gerrit
Code Issues Proposed changes

Fix comparison using reference equality instead of value equality

Browse Source 
Change-Id: I635573a20bdaabf07f4aac2f9eda4f943764ee02
This commit is contained in:
Andrew Bonventre
2016-11-22 18:20:26 -05:00
committed by David Pursehouse
parent 6978a7bb93
commit 5602a31d81
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
gerrit-server/src/main/java/com/google/gerrit/server/git/MergeUtil.java
View File

@@ -79,6 +79,7 @@ import java.util.Collections;
import java.util.Iterator; import java.util.Iterator;
import java.util.LinkedHashSet; import java.util.LinkedHashSet;
import java.util.List; import java.util.List;
import java.util.Objects;
import java.util.Set; import java.util.Set;
public class MergeUtil { public class MergeUtil {
@@ -658,7 +659,7 @@ public class MergeUtil {
rw.markStart(mergeTip); rw.markStart(mergeTip);
for (RevCommit c : alreadyAccepted) { for (RevCommit c : alreadyAccepted) {
// If branch was not created by this submit. // If branch was not created by this submit.
if (c != mergeTip) { if (!Objects.equals(c, mergeTip)) {
rw.markUninteresting(c); rw.markUninteresting(c);
} }
} }