opendev/gerrit
Code Issues Proposed changes

Merge "Notedb: Fix SUBMIT label on submitted patch set with CP/RIN strategy"

Browse Source
This commit is contained in:
David Pursehouse
2015-11-10 19:54:08 +00:00
committed by Gerrit Code Review
parent 1b2d4438de 13c1df397b
commit 70bce39e16
1 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
gerrit-server/src/main/java/com/google/gerrit/server/git/MergeOp.java
View File

@@ -1064,6 +1064,11 @@ public class MergeOp {
// If the submit strategy created a new revision (rebase, cherry-pick) // If the submit strategy created a new revision (rebase, cherry-pick)
// approve that as well // approve that as well
if (!psIdNewRev.equals(psId)) { if (!psIdNewRev.equals(psId)) {
update.setPatchSetId(psId);
update.commit();
// Create a new ChangeUpdate instance because we need to store meta data
// on another patch set (psIdNewRev).
update = updateFactory.create(control, timestamp);
batch = approve(control, psIdNewRev, user, batch = approve(control, psIdNewRev, user,
update, timestamp); update, timestamp);
// Write update commit after all normalized label commits. // Write update commit after all normalized label commits.