git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Junio C Hamano <gitster@pobox.com>
To: Joshua Hudson <jhudson@cedaron.com>
Cc: Johannes Schindelin <Johannes.Schindelin@gmx.de>,
	git@vger.kernel.org, Elijah Newren <newren@gmail.com>
Subject: Re: [PATCH] ll-merge: killing the external merge driver aborts the merge
Date: Tue, 27 Jun 2023 14:26:09 -0700	[thread overview]
Message-ID: <xmqqilb8fvgu.fsf@gitster.g> (raw)
In-Reply-To: <cd5046d4-d66c-9dac-87e7-cdb638124170@cedaron.com> (Joshua Hudson's message of "Tue, 27 Jun 2023 14:14:31 -0700")

Joshua Hudson <jhudson@cedaron.com> writes:

> Try changing kill -9 $$ to exit 137 # 128 + 9

Yeah, but then (1) we are not simulating a case where the external
merge driver hits a segfault or receives a signal from outside and
dies involuntarily, and (2) we are codifying that even on Windows,
program that was killed by signal N must exit with 128 + N, and
these are the reasons why I did not go that route.

Stepping back a bit, how does one typically diagnose programatically
on Windows, after "spawning" a separate program, if the program died
involuntarily and/or got killed?  It does not have to be "exit with
128 + signal number"---as long as it can be done programatically and
reliably, we would be happy.  The code to diagnose how the spawned
program exited in run_command(), which is in finish_command() and
then in wait_or_whine(), may have to be updated with such a piece of
Windows specific knowledge.

  reply	other threads:[~2023-06-27 21:26 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
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 [this message]
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=xmqqilb8fvgu.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).