summaryrefslogtreecommitdiff
path: root/compat/precompose_utf8.h
diff options
context:
space:
mode:
authorLibravatar Elijah Newren <newren@gmail.com>2018-06-30 18:24:59 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2018-07-11 09:38:36 -0700
commit92702392cefdbd66ca593fa909540230ef9e005e (patch)
tree2903cd89eb8e7a0287c0f0545eaeef4aa84cc12f /compat/precompose_utf8.h
parentt6044: add a testcase for index matching head, when head doesn't match HEAD (diff)
downloadtgif-92702392cefdbd66ca593fa909540230ef9e005e.tar.xz
merge-recursive: make sure when we say we abort that we actually abort
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>
Diffstat (limited to 'compat/precompose_utf8.h')
0 files changed, 0 insertions, 0 deletions