[PATCH v2 5/9] merge-recursive: make sure when we say we abort that we actually abort
- From
Elijah Newren <newren@gmail.com>
- Date
- Jul 1, 2018, 01:24 UTC
- Message-ID
- <20180701012503.14382-6-newren@gmail.com>
- In-Reply-To
- <20180701012503.14382-1-newren@gmail.com>
In commit 65170c07d4 ("merge-recursive: avoid incorporating uncommitted changes in a merge", 2017-12-21), it was noted that there was a special case when merge-recursive didn't rely on unpack_trees() to enforce the index == HEAD requirement, and thus that it needed to do that enforcement itself. Unfortunately, it returned the wrong exit status, signalling that the merge completed but had conflicts, rather than that it was aborted. Fix the return code, and while we're at it, change the error message to match what unpack_trees() would have printed.
Signed-off-by: Elijah Newren <newren@gmail.com> --- merge-recursive.c | 4 ++-- t/t6044-merge-unrelated-index-changes.sh | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/merge-recursive.c b/merge-recursive.c index f9384fabf..9c0699be5 100644 --- a/merge-recursive.c +++ b/merge-recursive.c @@ -3267,9 +3267,9 @@ int merge_trees(struct merge_options *o, struct strbuf sb = STRBUF_INIT; if (!o->call_depth && index_has_changes(&the_index, &sb)) { - err(o, _("Dirty index: cannot merge (dirty: %s)"), + err(o, _("Your local changes to the following files would be overwritten by merge:\n %s"), sb.buf); - return 0; + return -1; } output(o, 0, _("Already up to date!")); *result = head; diff --git a/t/t6044-merge-unrelated-index-changes.sh b/t/t6044-merge-unrelated-index-changes.sh index 92ec55255..3876cfa4f 100755 --- a/t/t6044-merge-unrelated-index-changes.sh +++ b/t/t6044-merge-unrelated-index-changes.sh @@ -116,7 +116,7 @@ test_expect_success 'recursive' ' test_path_is_missing .git/MERGE_HEAD ' -test_expect_failure 'recursive, when merge branch matches merge base' ' +test_expect_success 'recursive, when merge branch matches merge base' ' git reset --hard && git checkout B^0 &&
-- 2.18.0.137.g2a11d05a6.dirty