opendev/gerrit
Code Issues Proposed changes

Merge branch 'stable-2.12'

Browse Source 
* stable-2.12:
  Update replication plugin with merge from stable-2.11
  Correct RebaseChangeOp running hooks
  Set version to 2.11.5
  Release notes for Gerrit 2.11.5
  Update replication plugin revision
  Display latest result of branch list screen's filter

Change-Id: Ie6b06da12c5bb46a65cd56f36808f8bfd35011a3
This commit is contained in:
David Pursehouse
2015-11-12 22:35:29 -08:00
parent c94cbcd6b9 87dd1d6ad2
commit 0a2d8cb9c3
4 changed files with 100 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
gerrit-server/src/main/java/com/google/gerrit/server/change/RebaseChangeOp.java
View File

@@ -25,6 +25,7 @@ import com.google.gerrit.reviewdb.client.RevId;
import com.google.gerrit.server.ChangeUtil;
import com.google.gerrit.server.git.BatchUpdate;
import com.google.gerrit.server.git.BatchUpdate.ChangeContext;
import com.google.gerrit.server.git.BatchUpdate.Context;
import com.google.gerrit.server.git.BatchUpdate.RepoContext;
import com.google.gerrit.server.git.MergeUtil;
import com.google.gerrit.server.git.validators.CommitValidators;
@@ -148,6 +149,11 @@ public class RebaseChangeOp extends BatchUpdate.Op {
rebasedPatchSet = patchSetInserter.getPatchSet();
}
@Override
public void postUpdate(Context ctx) throws OrmException {
patchSetInserter.postUpdate(ctx);
}
public PatchSet getPatchSet() {
checkState(rebasedPatchSet != null,
"getPatchSet() only valid after executing update");