From 63c816512445b6c5200c548a76679a4d0aa58b83 Mon Sep 17 00:00:00 2001 From: Edwin Kempin Date: Thu, 12 Sep 2013 07:15:33 +0200 Subject: [PATCH] Reindex a change that during MergeOp is found to be already merged 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 --- .../src/main/java/com/google/gerrit/server/git/MergeOp.java | 1 + 1 file changed, 1 insertion(+) 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 cf8a3c4349..987a9083d2 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 @@ -509,6 +509,7 @@ public class MergeOp { commit.statusCode = CommitMergeStatus.ALREADY_MERGED; try { setMerged(chg, null); + indexer.index(chg); } catch (OrmException e) { log.error("Cannot mark change " + chg.getId() + " merged", e); }