summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEdwin Kempin <edwin.kempin@sap.com>2013-01-09 15:03:38 +0100
committerDavid Pursehouse <david.pursehouse@sonymobile.com>2013-01-10 11:25:57 +0900
commit328c9f7833ad8c1a3c38ce844ef31b693cc44a4f (patch)
tree03b28f3addb858fc48fb5bd226238baaf1ecbdb6
parentb9d83fcb9bf72cf9b7cabfc9197ace95f38446e8 (diff)
Create ref for new patch set on direct push (second try)
If a change is in review and a new commit that has the Change-Id of this change in its commit message is pushed directly, then a new patch set for this commit is created and the change gets automatically closed. The problem is that no change ref for this new patch set is created and as result the change ref that is shown for the new patch set in the WebUI and which is contained in the patchset-created event is invalid. Change-Id: I30843889a3f1d1e5a09503b2f30b363f1bf79495 Signed-off-by: Edwin Kempin <edwin.kempin@sap.com>
-rw-r--r--gerrit-server/src/main/java/com/google/gerrit/server/git/ReceiveCommits.java3
1 files changed, 3 insertions, 0 deletions
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/git/ReceiveCommits.java b/gerrit-server/src/main/java/com/google/gerrit/server/git/ReceiveCommits.java
index 7d1a33a633..a3a6ac154a 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/git/ReceiveCommits.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/git/ReceiveCommits.java
@@ -1696,6 +1696,9 @@ public class ReceiveCommits {
markChangeMergedByPush(db, this);
}
+ if (cmd.getResult() == NOT_ATTEMPTED) {
+ cmd.execute(rp);
+ }
replication.fire(project.getNameKey(), newPatchSet.getRefName());
hooks.doPatchsetCreatedHook(change, newPatchSet, db);
replaceProgress.update(1);