development/git
development/git
1
0
Fork 0
mirror of https://github.com/git/git synced 2024-08-28 03:59:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

merge-recursive: make sure when we say we abort that we actually abort

Browse source 
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>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Elijah Newren 2018-06-30 18:24:59 -07:00 committed by Junio C Hamano
parent cf69f2af08
commit 92702392ce
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
merge-recursive.c
View file

@ -1984,9 +1984,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;

2
t/t6044-merge-unrelated-index-changes.sh
View file

@ -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 &&