From: Junio C Hamano <gitster@pobox.com>
To: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Cc: git@vger.kernel.org, Elijah Newren <newren@gmail.com>,
Joshua Hudson <jhudson@cedaron.com>
Subject: Re: [PATCH] ll-merge: killing the external merge driver aborts the merge
Date: Tue, 27 Jun 2023 12:08:10 -0700 [thread overview]
Message-ID: <xmqqedlwhgf9.fsf@gitster.g> (raw)
In-Reply-To: <59b7a582-be68-3f7b-a06f-3bd662582a1d@gmx.de> (Johannes Schindelin's message of "Tue, 27 Jun 2023 14:02:02 +0200 (CEST)")
Johannes Schindelin <Johannes.Schindelin@gmx.de> writes:
> 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.
next prev parent reply other threads:[~2023-06-27 19:08 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-06-22 16:50 Design issue in git merge driver interface Joshua Hudson
2023-06-22 19:12 ` Junio C Hamano
2023-06-23 0:33 ` [PATCH] ll-merge: killing the external merge driver aborts the merge Junio C Hamano
2023-06-23 6:25 ` Elijah Newren
2023-06-23 16:26 ` Junio C Hamano
2023-06-23 23:31 ` Junio C Hamano
2023-06-25 13:40 ` Joshua Hudson
2023-06-27 12:02 ` Johannes Schindelin
2023-06-27 13:43 ` Joshua Hudson
2023-06-27 19:08 ` Junio C Hamano [this message]
2023-06-27 19:10 ` Joshua Hudson
2023-06-27 20:04 ` Junio C Hamano
2023-06-27 21:14 ` Joshua Hudson
2023-06-27 21:26 ` Junio C Hamano
2023-06-27 21:32 ` Joshua Hudson
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=xmqqedlwhgf9.fsf@gitster.g \
--to=gitster@pobox.com \
--cc=Johannes.Schindelin@gmx.de \
--cc=git@vger.kernel.org \
--cc=jhudson@cedaron.com \
--cc=newren@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.