ChangeMergedEvent should always be called with merged patch set

ChangeMergedEvent should always have information about actually merged
patch set. Currently this sentence is only true for submit strategies
that don't create new patch sets like 'fast forward only' and 'merge if
necessary'. In case of 'cherry pick' and 'rebase if necessary' Gerrit
will automatically create new patch, and then send ChangeMergedEvent
with old patch set, the one that was submitted, but not actually merged,
which is a bug.

This change ensures that ChangeMergeEvent will always be send with
reference to patch set that was actually merged (not submitted).

Bug: Issue 2028
Change-Id: I8841e8dee12dcbd91922fea312c1d3f714e2bbeb
Signed-off-by: Dariusz Luksza <dariusz@luksza.org>
(cherry picked from commit 891c45799506c7a770e235727497f06f60973f5b)
Reviewed-by: Ismo Haataja <ismo.haataja@digia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>

1 files changed, 1 insertions, 1 deletions

diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/git/MergeOp.java b/gerrit-server/src/main/java/com/google/gerrit/server/git/MergeOp.java
index 3afbdd66f4..8db30ec291 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/git/MergeOp.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/git/MergeOp.java
@@ -897,7 +897,7 @@ public class MergeOp {
         try {
           hooks.doChangeMergedHook(c,
               accountCache.get(submitter.getAccountId()).getAccount(),
-              db.patchSets().get(c.currentPatchSetId()), db);
+              db.patchSets().get(commit.patchsetId), db);
         } catch (OrmException ex) {
           log.error("Cannot run hook for submitted patch set " + c.getId(), ex);
         }