summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrew Bonventre <andybons@chromium.org>2016-11-22 18:20:26 -0500
committerDavid Pursehouse <dpursehouse@collab.net>2016-11-23 02:07:44 +0000
commit5602a31d8175cfd0e82c50b3eee7adb1879c6411 (patch)
tree474bfc8f2169c7067a71c810b0eca2aabb8f8fa1
parent6978a7bb934b2d2f5eadc34724f2ac25f211d8f1 (diff)
Fix comparison using reference equality instead of value equality
-rw-r--r--gerrit-server/src/main/java/com/google/gerrit/server/git/MergeUtil.java3
1 files changed, 2 insertions, 1 deletions
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/git/MergeUtil.java b/gerrit-server/src/main/java/com/google/gerrit/server/git/MergeUtil.java
index 9124c627e5..2025e99b93 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/git/MergeUtil.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/git/MergeUtil.java
@@ -79,6 +79,7 @@ import java.util.Collections;
import java.util.Iterator;
import java.util.LinkedHashSet;
import java.util.List;
+import java.util.Objects;
import java.util.Set;
public class MergeUtil {
@@ -658,7 +659,7 @@ public class MergeUtil {
rw.markStart(mergeTip);
for (RevCommit c : alreadyAccepted) {
// If branch was not created by this submit.
- if (c != mergeTip) {
+ if (!Objects.equals(c, mergeTip)) {
rw.markUninteresting(c);
}
}