Browse Source

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()
pull/1276/head
Junio C Hamano 2 months ago
parent
commit
da4827056a
  1. 3
      run-command.c

3
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;
}

Loading…
Cancel
Save