commit ce4d28cb1989d2ff49821740e67ae70cc2577cc5
author Dave Borowitz <dborowitz@google.com> Wed Sep 18 17:01:15 2013 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Sep 18 17:01:16 2013 +0000
tree 4f8a81326bf5e5fed93c2db3abbb4677b50a9fdf
parent b39e4d6a6002bdd66ec72a8553a43830590399f7
parent cdff6cfc4f84c0c55593d295425eb2d3941773e0

Merge "Mark ALREADY_MERGED changes as merged in the DB and run hooks" into stable-2.7

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

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 9715d9c4..d86e48c 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
@@ -599,7 +599,7 @@
           if (rw.isMergedInto(commit, branchTip)) {
             commit.statusCode = CommitMergeStatus.ALREADY_MERGED;
             try {
-              setMergedPatchSet(chg.getId(), ps.getId());
+              setMerged(chg, null);
             } catch (OrmException e) {
               log.error("Cannot mark change " + chg.getId() + " merged", e);
             }