summaryrefslogtreecommitdiff
path: root/run-command.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2017-08-23 21:33:49 (GMT)
committerJunio C Hamano <gitster@pobox.com>2017-08-23 21:33:49 (GMT)
commit08692770339ff551485812d34c54fa6d290694f3 (patch)
tree717f5848bb6f23283b630829981a9f6880e9f16f /run-command.c
parente22a48c4c093b7af1393c6509e3ad39c3bab8473 (diff)
parentc1e860f1dcd29495f98fc60d68f75151196335e6 (diff)
downloadgit-08692770339ff551485812d34c54fa6d290694f3.zip
git-08692770339ff551485812d34c54fa6d290694f3.tar.gz
git-08692770339ff551485812d34c54fa6d290694f3.tar.bz2
Merge branch 'js/run-process-parallel-api-fix' into maint
API fix. * js/run-process-parallel-api-fix: run_processes_parallel: change confusing task_cb convention
Diffstat (limited to 'run-command.c')
-rw-r--r--run-command.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/run-command.c b/run-command.c
index 9e36151..b5e6eb3 100644
--- a/run-command.c
+++ b/run-command.c
@@ -1533,7 +1533,7 @@ static int pp_start_one(struct parallel_processes *pp)
if (start_command(&pp->children[i].process)) {
code = pp->start_failure(&pp->children[i].err,
pp->data,
- &pp->children[i].data);
+ pp->children[i].data);
strbuf_addbuf(&pp->buffered_output, &pp->children[i].err);
strbuf_reset(&pp->children[i].err);
if (code)
@@ -1601,7 +1601,7 @@ static int pp_collect_finished(struct parallel_processes *pp)
code = pp->task_finished(code,
&pp->children[i].err, pp->data,
- &pp->children[i].data);
+ pp->children[i].data);
if (code)
result = code;