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

From: Junio C Hamano <gitster@pobox.com>
Date: Jun 27, 2023, 19:08 UTC
Message-ID: <xmqqedlwhgf9.fsf@gitster.g>
In-Reply-To: <59b7a582-be68-3f7b-a06f-3bd662582a1d@gmx.de>

Johannes Schindelin <Johannes.Schindelin@gmx.de> writes:

Show 12 quoted lines

> On Fri, 23 Jun 2023, Junio C Hamano wrote:
>
>> Junio C Hamano <gitster@pobox.com> writes:
>>
>> > Elijah Newren <newren@gmail.com> writes:
>> >
>> >> Reviewed-by: Elijah Newren <newren@gmail.com>
>> >
>> >
>> > 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.