Re: [PATCH 2/2] Wait for child on signal death for aliases to externals

From: Trygve Aaberge <trygveaa@gmail.com>
Date: Jul 7, 2020, 10:19 UTC
Message-ID: <20200707101959.qsuumtuelepnxore@aaberge.net>
In-Reply-To: <20200706211403.GB85133@coredump.intra.peff.net>

On Mon, Jul 06, 2020 at 17:14:03 -0400, Jeff King wrote:

Show 8 quoted lines

>     I guess to recreate that you'd need to trigger the pager inside the
>     alias itself, like:
> 
>       $ git -c alias.foo='!{ echo foo; sleep 10; echo bar; } | less' foo
>       ^C
> 
>     which does exhibit the annoying behavior (we exit, and pgrp loses
>     the tty session leader bit, and the pager gets EIO).

Yes, that's correct. So it's a rather niche use case. The main thing for me was the first commit, but I figured I should fix this too while I was at it. I don't think I have any current use cases where I would need this fix, but I could imagine some existing. For instance, before stash list got the -p option, I had this alias:

  stash-p = !git show $(git stash list | cut -d: -f1)

And this is one use case where the pager is invoked inside the alias, so the first patch doesn't help, but the second one fixes it. While this alias isn't necessary anymore, there could be similar use cases.

Show 10 quoted lines

>   - the child for some reason decides not to respect the signal.
>     Obviously running a pager is one reason it would decide to do so,
>     and we'd be improving the behavior there. I have trouble imagining a
>     case where waiting for it would do the _wrong_ thing. I.e., if I do:
> 
>       $ git -c alias.foo='!trap "echo got signal" INT; sleep 5' foo
> 
>     it probably does make sense for us to continue to wait on that alias
>     to complete (I'm not sure what anyone would try to accomplish with
>     that, but waiting seems like the least-astonishing thing to me).

Yeah, I agree. Since it's an alias to an external command, I think it should behave just as when running that external command by itself where there would be no parent killing it on ^C.

Show 6 quoted lines

> However, there is one weirdness worth thinking about. Because the
> wait_after_clean feature relies on actually trying to clean the child,
> Git will actually send a signal to the alias shell. For a signal, we'll
> try to pass along the same signal, so it just means the shell will get
> SIGINT twice in this case (or more likely, they'll race and we'll ignore
> the duplicate signal while the child is in its own handler).

Hm, okay, not sure if anything should be done about this.

Show 5 quoted lines

> But a more interesting case is if somebody sends the parent git process
> a signal but _not_ the child (e.g., kill -TERM). Then we'd pass SIGTERM
> along to the child. I'd venture to say that's _probably_ the right thing
> to do, if only because it's exactly what we do for a dashed external as
> well.

Hm, not sure. If you run a process in bash and send TERM to bash it seems to just ignore the signal. The child keeps running, and bash even keeps running after the child exits. If you don't run a process in bash it respects TERM and exits. I'm wondering if an alias executing an external command should behave the same way as when a shell does it.

Though, I also see that this only happens when bash runs interactively. If you run `bash -c 'echo; sleep 1000'` it exits, but sleep keeps running.

Show 5 quoted lines

> Sorry that ended up so long-winded, but my conclusion is: this is doing
> the right thing. We should probably embed some of that discussion in the
> commit message, but I think the simplest argument is just: this is what
> we do for external commands we run, so treating shell aliases the same
> in terms of passing along signals makes things simple and consistent.

Thanks, yeah I'll send an updated patch with a better description.

-- 
Trygve Aaberge