From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 23 Jun 2023 23:31:15 GMT
Subject: Re: [PATCH] ll-merge: killing the external merge driver aborts the merge
Message-ID: <xmqqjzvt92nw.fsf@gitster.g>
In-Reply-To: <xmqqv8feb0vo.fsf@gitster.g>

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
merge driver.  Does run_command() there report process death due to
signals differently, I wonder?

https://github.com/git/git/actions/runs/5360400800/jobs/9725341775#step:6:285

shows that on Windows, aborted external merge driver is not noticed
and we happily take the auto-merged result, ouch.

I am tempted to protect this step of the test with a prerequisite to
skip it on Windows for now.  Anybody with better idea?

Thanks.