Files
git/Documentation
Junio C Hamano 2b7b788fb3 ll-merge: killing the external merge driver aborts the merge
When an external merge driver dies with a signal, we should not
expect that the result left on the filesystem is in any useful
state.  However, because the current code uses the return value from
run_command() and declares any positive value as a sign that the
driver successfully left conflicts in the result, and because the
return value from run_command() for a subprocess that died upon a
signal is positive, we end up treating whatever garbage left on the
filesystem as the result the merge driver wanted to leave us.

run_command() returns larger than 128 (WTERMSIG(status) + 128, to be
exact) when it notices that the subprocess died with a signal, so
detect such a case and return LL_MERGE_ERROR from ll_ext_merge().

Signed-off-by: Junio C Hamano <gitster@pobox.com>
Reviewed-by: Elijah Newren <newren@gmail.com>
2023-06-23 09:27:10 -07:00
..
2023-06-20 15:53:13 -07:00
2023-02-15 17:11:52 -08:00
2022-10-30 21:04:44 -04:00
2023-02-18 09:29:13 -08:00
2022-10-25 15:44:18 -07:00
2022-02-02 14:50:09 -08:00
2023-05-06 14:32:20 -07:00
2021-09-28 10:31:02 -07:00
2021-12-10 14:35:03 -08:00
2023-05-16 11:38:14 -07:00
2023-05-17 10:11:41 -07:00
2019-05-07 13:04:48 +09:00
2019-10-21 12:02:39 +09:00