Subject: Re: [PATCH] ll-merge: killing the external merge driver aborts the merge

From: Junio C Hamano <[email-masked]>
Date: Tue, 27 Jun 2023 12:08:10 -0700

Johannes Schindelin <[email-masked]> writes:

> On Fri, 23 Jun 2023, Junio C Hamano wrote:
>
>> Junio C Hamano <[email-masked]> writes:
>>
>> > Elijah Newren <[email-masked]> writes:
>> >
>> >> Reviewed-by: Elijah Newren <[email-masked]>
>> >
>> >
>> > Thanks for a quick review.
>>
>> Unfortunately Windows does not seem to correctly detect the aborting

Sorry, I did not mean "abort(3)" literally.  What I meant was that
an external merge driver that gets spawned via the run_command()
interface may not die by calling exit()---like "killed by signal"
(including "segfaulting").  The new test script piece added in the
patch did "kill -9 $$" to kill the external merge driver itself,
which gets reported as "killed by signal" from run_command() by
returning the signal number + 128, but that did not pass Windows CI.