Merge branch 'js/wait-or-whine-can-fail' into seen

gitster · gitster · commit 727726a3d28e · 2022-04-28T15:02:53.000-07:00
* js/wait-or-whine-can-fail:
  run-command: don't spam trace2_child_exit()
diff --git 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;
 }
 

Original file line number	Diff line number	Diff line change
`@@ -984,7 +984,8 @@ int finish_command(struct child_process *cmd)`
`984`	`984`	`int finish_command_in_signal(struct child_process *cmd)`
`985`	`985`	`{`
`986`	`986`	`int ret = wait_or_whine(cmd->pid, cmd->args.v[0], 1);`
`987`		`- trace2_child_exit(cmd, ret);`
	`987`	`+ if (ret != -1)`
	`988`	`+ trace2_child_exit(cmd, ret);`
`988`	`989`	`return ret;`
`989`	`990`	`}`
`990`	`991`