opendev/gerrit
Code Issues Proposed changes

Merge branch 'stable-2.7'

Browse Source 
* stable-2.7:
  Mark ALREADY_MERGED changes as merged in the DB

Change-Id: I360c0593948786fe95418f7001b22b58a1eaee92
This commit is contained in:
Dave Borowitz
2013-07-17 12:06:10 -07:00
parent 0d90f3d8df 7549dfa817
commit 2448aa62df
1 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -603,6 +603,11 @@ public class MergeOp {
try {
if (rw.isMergedInto(commit, branchTip)) {
commit.statusCode = CommitMergeStatus.ALREADY_MERGED;
try {
setMergedPatchSet(chg.getId(), ps.getId());
} catch (OrmException e) {
log.error("Cannot mark change " + chg.getId() + " merged", e);
}
continue;
}
} catch (IOException err) {