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

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

@@ -1064,6 +1064,11 @@ public class MergeOp {
       // If the submit strategy created a new revision (rebase, cherry-pick)
       // approve that as well
       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,
             update, timestamp);
         // Write update commit after all normalized label commits.