diff options
| author | Junio C Hamano <gitster@pobox.com> | 2022-06-14 01:53:44 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2022-06-14 01:53:44 +0300 |
| commit | da4827056acd8acac882fdfc93fd5b70472927ea (patch) | |
| tree | 62e4533a51a47f8632e2cd93e72d5e275e9e232b /run-command.c | |
| parent | fe66167535dd8b395f16fcba7863c36beb365ef9 (diff) | |
| parent | ce3986bb224067ecdb372d7cb7a56d22682e9a31 (diff) | |
Merge branch 'js/wait-or-whine-can-fail'
We used to log an error return from wait_or_whine() as process
termination of the waited child, which was incorrect.
* js/wait-or-whine-can-fail:
run-command: don't spam trace2_child_exit()
Diffstat (limited to 'run-command.c')
| -rw-r--r-- | run-command.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/run-command.c b/run-command.c index 8e36b8ee74..14f17830f5 100644 --- a/run-command.c +++ b/run-command.c @@ -984,7 +984,8 @@ int finish_command(struct child_process *cmd) int finish_command_in_signal(struct child_process *cmd) { int ret = wait_or_whine(cmd->pid, cmd->args.v[0], 1); - trace2_child_exit(cmd, ret); + if (ret != -1) + trace2_child_exit(cmd, ret); return ret; } |