commit c2bdbe7169051947bd635a9c9a4403f278402245
author David Pursehouse <dpursehouse@collab.net> Thu Nov 24 08:43:31 2016 +0900
committer David Pursehouse <dpursehouse@collab.net> Thu Nov 24 08:43:38 2016 +0900
tree 333f00c4f85acec9ca6e69010aae6fdb9e401b0c
parent c788ca19a1599c903fc2637314f49188253e2d9b
parent 5602a31d8175cfd0e82c50b3eee7adb1879c6411

Merge branch 'stable-2.12' into stable-2.13

* stable-2.12:
  Fix comparison using reference equality instead of value equality

Change-Id: Ib9e77ff49f8741dc3765ad7930c1e3d077448ce2

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 43d88e5..ae11630 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
@@ -84,6 +84,7 @@
 import java.util.Iterator;
 import java.util.LinkedHashSet;
 import java.util.List;
+import java.util.Objects;
 import java.util.Set;
 
 /**
@@ -683,7 +684,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);
         }
       }