diff options
| author | Trygve Aaberge <trygveaa@gmail.com> | 2020-07-07 14:17:14 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-07-07 13:14:05 -0700 |
| commit | e662df7e830a9d93ca36b74a7b5e670e139b0da1 (patch) | |
| tree | d3a20d2fbe451823a1726578b7e240e45921d3c0 /run-command.c | |
| parent | af6b65d45ef179ed52087e80cb089f6b2349f4ec (diff) | |
| download | git-e662df7e830a9d93ca36b74a7b5e670e139b0da1.tar.gz | |
Wait for child on signal death for aliases to builtins
When you hit ^C all the processes in the tree receives it. When a git
command uses a pager, git ignores this and waits until the pager quits.
However, when using an alias there is an additional process in the tree
which didn't ignore the signal. That caused it to exit which in turn
caused the pager to exit. This fixes that for aliases to builtins.
This was originally fixed in 46df6906 (execv_dashed_external: wait
for child on signal death, 2017-01-06), but was broken by ee4512ed
(trace2: create new combined trace facility, 2019-02-22) and then
b9140840 (git: avoid calling aliased builtins via their dashed form,
2019-07-29).
Signed-off-by: Trygve Aaberge <trygveaa@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'run-command.c')
| -rw-r--r-- | run-command.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/run-command.c b/run-command.c index f5e1149f9b..5d65335d13 100644 --- a/run-command.c +++ b/run-command.c @@ -1039,6 +1039,7 @@ int run_command_v_opt_cd_env_tr2(const char **argv, int opt, const char *dir, cmd.silent_exec_failure = opt & RUN_SILENT_EXEC_FAILURE ? 1 : 0; cmd.use_shell = opt & RUN_USING_SHELL ? 1 : 0; cmd.clean_on_exit = opt & RUN_CLEAN_ON_EXIT ? 1 : 0; + cmd.wait_after_clean = opt & RUN_WAIT_AFTER_CLEAN ? 1 : 0; cmd.dir = dir; cmd.env = env; cmd.trace2_child_class = tr2_class; |