opendev/gerrit
Code Issues Proposed changes

Close changes oldest-change-first when merging on push

Browse Source 
This is the order that "all" submit strategies closes changes.

Bug: Issue 11082
Change-Id: Iaa76251645d8048983b0688122f98f2d74201821
This commit is contained in:
Sven Selberg
2019-06-26 17:43:46 +02:00
committed by Sven Selberg
parent 87b2b35d16
commit ac4219971b
1 changed files with 1 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
java/com/google/gerrit/server/git/receive/ReceiveCommits.java
View File

@@ -3094,6 +3094,7 @@ class ReceiveCommits {
Branch.NameKey branch = new Branch.NameKey(project.getNameKey(), refName); Branch.NameKey branch = new Branch.NameKey(project.getNameKey(), refName);
rw.reset(); rw.reset();
rw.sort(RevSort.REVERSE);
rw.markStart(newTip); rw.markStart(newTip);
if (!ObjectId.zeroId().equals(cmd.getOldId())) { if (!ObjectId.zeroId().equals(cmd.getOldId())) {
rw.markUninteresting(rw.parseCommit(cmd.getOldId())); rw.markUninteresting(rw.parseCommit(cmd.getOldId()));