opendev/gerrit
Code Issues Proposed changes

Merge branch 'stable-2.12' into stable-2.13

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

Change-Id: Ib9e77ff49f8741dc3765ad7930c1e3d077448ce2
This commit is contained in:
David Pursehouse 2016-11-24 08:43:31 +09:00
commit c2bdbe7169
1 changed files with 2 additions and 1 deletions
Show Stats 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

@ -84,6 +84,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;
/**
@ -683,7 +684,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);
}
}