opendev/gerrit
Code Issues Proposed changes

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

Browse Source
This commit is contained in:
Dave Borowitz
2013-09-18 17:01:15 +00:00
committed by Gerrit Code Review
parent b39e4d6a60 cdff6cfc4f
commit ce4d28cb19
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -599,7 +599,7 @@ public class MergeOp {
if (rw.isMergedInto(commit, branchTip)) { if (rw.isMergedInto(commit, branchTip)) {
commit.statusCode = CommitMergeStatus.ALREADY_MERGED; commit.statusCode = CommitMergeStatus.ALREADY_MERGED;
try { try {
setMergedPatchSet(chg.getId(), ps.getId()); setMerged(chg, null);
} catch (OrmException e) { } catch (OrmException e) {
log.error("Cannot mark change " + chg.getId() + " merged", e); log.error("Cannot mark change " + chg.getId() + " merged", e);
} }