commit 5602a31d8175cfd0e82c50b3eee7adb1879c6411
author Andrew Bonventre <andybons@chromium.org> Tue Nov 22 18:20:26 2016 -0500
committer David Pursehouse <dpursehouse@collab.net> Wed Nov 23 02:07:44 2016 +0000
tree 474bfc8f2169c7067a71c810b0eca2aabb8f8fa1
parent 6978a7bb934b2d2f5eadc34724f2ac25f211d8f1

Fix comparison using reference equality instead of value equality

Change-Id: I635573a20bdaabf07f4aac2f9eda4f943764ee02

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

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 9124c62..2025e99 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.Iterator;
 import java.util.LinkedHashSet;
 import java.util.List;
+import java.util.Objects;
 import java.util.Set;
 
 public class MergeUtil {
@@ -658,7 +659,7 @@
       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);
         }
       }