Re: [PATCH 1/5] run-command: Fix early shutdown
From: Junio C Hamano <hidden>
Date: 2016-06-15 23:06:55
Stefan Beller [off-list ref] writes:
The return value of `pp_collect_finished` indicates if we want to shutdown the parallel processing early. Both returns from that function should return any accumulated results. Signed-off-by: Stefan Beller <redacted> ---
Makes sense. The code could "break" out of the loop, leaving only one return site in the function, which would be a way to ensure that we'd consistently return the accumulated result, but this would also do. Thanks.
quoted hunk
run-command.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)diff --git a/run-command.c b/run-command.c index ef3da27..8f47c6e 100644 --- a/run-command.c +++ b/run-command.c@@ -1077,7 +1077,7 @@ static int pp_collect_finished(struct parallel_processes *pp) while (pp->nr_processes > 0) { pid = waitpid(-1, &wait_status, WNOHANG); if (pid == 0) - return 0; + return result; if (pid < 0) die_errno("wait");