diff options
| author | Junio C Hamano <gitster@pobox.com> | 2020-07-15 23:29:43 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-07-15 23:29:43 (GMT) |
| commit | 05920f041a57ac9ee86a8615cfca414450e65365 (patch) | |
| tree | 0c79e5f67c6baa22073d8aaf8c9b57011c2adedd /run-command.c | |
| parent | bd42bbe1a46c0fe486fc33e82969275e27e4dc19 (diff) | |
| parent | c0d73a59c956ace5e02c9f0fab336ac4dbe64102 (diff) | |
| download | git-05920f041a57ac9ee86a8615cfca414450e65365.zip git-05920f041a57ac9ee86a8615cfca414450e65365.tar.gz git-05920f041a57ac9ee86a8615cfca414450e65365.tar.bz2 | |
Merge branch 'ta/wait-on-aliased-commands-upon-signal' into master
When an aliased command, whose output is piped to a pager by git,
gets killed by a signal, the pager got into a funny state, which
has been corrected (again).
* ta/wait-on-aliased-commands-upon-signal:
Wait for child on signal death for aliases to externals
Wait for child on signal death for aliases to builtins
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 9b3a57d..a735e38 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; |