opendev/gerrit
Code Issues Proposed changes

Reindex a change that during MergeOp is found to be already merged

Browse Source 
If in MergeOp we find that a change to be merged is actually already
merged its status is simply set to MERGED. After updating the change
status the change should be reindexed.

Change-Id: Ib5bb4e1fc9b60e10640add32a859210e10189201
Signed-off-by: Edwin Kempin <edwin.kempin@sap.com>
This commit is contained in:
Edwin Kempin
2013-09-12 07:15:33 +02:00
committed by David Pursehouse
parent 01bf9abf38
commit 63c8165124
1 changed files with 1 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -509,6 +509,7 @@ public class MergeOp {
commit.statusCode = CommitMergeStatus.ALREADY_MERGED; commit.statusCode = CommitMergeStatus.ALREADY_MERGED;
try { try {
setMerged(chg, null); setMerged(chg, null);
indexer.index(chg);
} catch (OrmException e) { } catch (OrmException e) {
log.error("Cannot mark change " + chg.getId() + " merged", e); log.error("Cannot mark change " + chg.getId() + " merged", e);
} }