diff options
| author | Jean-Jacques Lafay <jeanjacques.lafay@gmail.com> | 2015-11-17 21:49:14 +0100 |
|---|---|---|
| committer | Jean-Jacques Lafay <jeanjacques.lafay@gmail.com> | 2015-11-17 21:50:15 +0100 |
| commit | 224ed4417e8da47eed701a234e183d478a106e9c (patch) | |
| tree | fbba70c9410104f55fd3a0fab7c56e2daabe37c3 | |
| parent | 87f70eb568c16aef19fdb9d81daacdb9552083ef (diff) | |
Handle new CommitMergeStatus REBASE_MERGE_CONFLICT in MergeOp
Following 54ac00d3, PATH_CONFLICT has been refined with another status
REBASE_MERGE_CONFLICT, but this has not been reported in
MergeOp.updateChangeStatus(), resulting in a poor message in the comments.
Change-Id: Ied8ff0f8f3350e59e7ab1c2d7a0d114624cd7d32
| -rw-r--r-- | gerrit-server/src/main/java/com/google/gerrit/server/git/MergeOp.java | 1 |
1 files changed, 1 insertions, 0 deletions
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 74474f0203..fc2f6726b1 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 @@ -884,6 +884,7 @@ public class MergeOp { break; case PATH_CONFLICT: + case REBASE_MERGE_CONFLICT: case MANUAL_RECURSIVE_MERGE: case CANNOT_CHERRY_PICK_ROOT: case NOT_FAST_FORWARD: |