opendev/gerrit
Code Issues Proposed changes

Merge "Fix incorrect mergeTip detection in ChangeJson.toRevisionInfo."

Browse Source
This commit is contained in:
Dave Borowitz
2016-12-01 15:23:27 +00:00
committed by Gerrit Code Review
parent 232e0cd72a 31e4687891
commit d1091dfc81
2 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/api/change/ChangeIT.java
View File

@@ -1823,6 +1823,7 @@ public class ChangeIT extends AbstractDaemonTest {
@Override @Override
public String onSubmit(String newCommitMessage, RevCommit original, public String onSubmit(String newCommitMessage, RevCommit original,
RevCommit mergeTip, Branch.NameKey destination) { RevCommit mergeTip, Branch.NameKey destination) {
assertThat(original.getName()).isNotEqualTo(mergeTip.getName());
return newCommitMessage + "Custom: " + destination.get(); return newCommitMessage + "Custom: " + destination.get();
} }
}); });

2
gerrit-server/src/main/java/com/google/gerrit/server/change/ChangeJson.java
View File

@@ -1112,7 +1112,7 @@ public class ChangeJson {
out.commit = toCommit(ctl, rw, commit, has(WEB_LINKS), fillCommit); out.commit = toCommit(ctl, rw, commit, has(WEB_LINKS), fillCommit);
} }
if (addFooters) { if (addFooters) {
Ref ref = repo.exactRef(in.getRefName()); Ref ref = repo.exactRef(ctl.getChange().getDest().get());
RevCommit mergeTip = null; RevCommit mergeTip = null;
if (ref != null){ if (ref != null){
mergeTip = rw.parseCommit(ref.getObjectId()); mergeTip = rw.parseCommit(ref.getObjectId());