summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEdwin Kempin <ekempin@google.com>2015-11-13 02:30:26 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2015-11-13 02:30:26 +0000
commit87dd1d6ad2ae65592cbb4c883d380a27005be761 (patch)
tree904b610b5aaa72ca915606b1cdb929f8f1b097cb
parent40a6a8af042f6a275d64e07080bff35fed6ba4a0 (diff)
parent864355d71ea94cfe09f5d95637767661ff41352a (diff)
Merge "Correct RebaseChangeOp running hooks" into stable-2.12
-rw-r--r--gerrit-server/src/main/java/com/google/gerrit/server/change/RebaseChangeOp.java6
1 files changed, 6 insertions, 0 deletions
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/change/RebaseChangeOp.java b/gerrit-server/src/main/java/com/google/gerrit/server/change/RebaseChangeOp.java
index 31bfc500b8..d3367a085f 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/change/RebaseChangeOp.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/change/RebaseChangeOp.java
@@ -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");