From: Phillip Wood <phillip.wood123@gmail.com>
To: Johannes Schindelin <Johannes.Schindelin@gmx.de>,
Phillip Wood via GitGitGadget <gitgitgadget@gmail.com>
Cc: git@vger.kernel.org, Jeff King <peff@peff.net>,
Phillip Wood <phillip.wood@dunelm.org.uk>,
Junio C Hamano <gitster@pobox.com>
Subject: Re: [PATCH] rebase -i: ignore signals when forking subprocesses
Date: Fri, 8 Sep 2023 11:02:59 +0100 [thread overview]
Message-ID: <4fecbf96-aa04-41bd-a589-bf7c368d586c@gmail.com> (raw)
In-Reply-To: <912205bc-37c5-edbf-2f85-f26991ad65eb@gmx.de>
Hi Johannes
On 07/09/2023 13:57, Johannes Schindelin wrote:
> Hi Phillip,
>
> On Thu, 7 Sep 2023, Phillip Wood via GitGitGadget wrote:
>
>> From: Phillip Wood <phillip.wood@dunelm.org.uk>
>>
>> If the user presses Ctrl-C to interrupt a program run by a rebase "exec"
>> command then SIGINT will also be sent to the git process running the
>> rebase resulting in it being killed. Fortunately the consequences of
>> this are not severe as all the state necessary to continue the rebase is
>> saved to disc but it would be better to avoid killing git and instead
>> report that the command failed. A similar situation occurs when the
>> sequencer runs "git commit" or "git merge". If the user generates SIGINT
>> while editing the commit message then the git processes creating the
>> commit will ignore it but the git process running the rebase will be
>> killed.
>>
>> Fix this by ignoring SIGINT and SIGQUIT when forking "exec" commands,
>> "git commit" and "git merge". This matches what git already does when
>> running the user's editor and matches the behavior of the standard
>> library's system() function.
>
> ACK
Thanks
>>
>> Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk>
>> ---
>> rebase -i: ignore signals when forking subprocesses
>>
>> Having written this I started thinking about what happens when we fork
>> hooks, merge strategies and merge drivers. I now wonder if it would be
>> better to change run_command() instead - are there any cases where we
>> actually want git to be killed when the user interrupts a child process?
>
> I am not sure that we can rely on arbitrary hooks to do the right thing
> upon Ctrl+C, which is to wrap up and leave. So I _guess_ that we will have
> to leave it an opt-in.
Peff pointed out it doesn't play well with "gc --auto" either. Do you
have any thoughts (particularly about the implications for Windows) on
his suggestion to put the child in it's own session, or putting the
child in its own process group and making that the foreground process
group of the controlling terminal?
> However, we could easily make it an option that `run_command()` handles,
> much like `no_stdin`.
That's an interesting idea.
Best Wishes
Phillip
next prev parent reply other threads:[~2023-09-08 10:03 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-09-07 10:03 [PATCH] rebase -i: ignore signals when forking subprocesses Phillip Wood via GitGitGadget
2023-09-07 12:57 ` Johannes Schindelin
2023-09-08 10:02 ` Phillip Wood [this message]
2023-09-10 8:24 ` Johannes Schindelin
2023-09-07 21:06 ` Jeff King
2023-09-08 9:59 ` Phillip Wood
2023-09-08 13:11 ` Phillip Wood
2023-09-10 10:05 ` Oswald Buddenhagen
2023-09-11 10:00 ` Phillip Wood
2023-09-11 10:14 ` Phillip Wood
2023-09-11 10:32 ` Oswald Buddenhagen
2023-09-13 15:33 ` Phillip Wood
2023-09-13 16:40 ` Oswald Buddenhagen
2023-09-14 9:56 ` Jeff King
2023-09-14 13:50 ` Phillip Wood
2023-09-07 21:16 ` Junio C Hamano
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=4fecbf96-aa04-41bd-a589-bf7c368d586c@gmail.com \
--to=phillip.wood123@gmail.com \
--cc=Johannes.Schindelin@gmx.de \
--cc=git@vger.kernel.org \
--cc=gitgitgadget@gmail.com \
--cc=gitster@pobox.com \
--cc=peff@peff.net \
--cc=phillip.wood@dunelm.org.uk \
/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).