mirror of
https://github.com/git/git
synced 2024-08-27 11:39:22 +00:00
Merge branch 'js/run-process-parallel-api-fix'
API fix. * js/run-process-parallel-api-fix: run_processes_parallel: change confusing task_cb convention
This commit is contained in:
commit
4a636e7682
|
@ -930,7 +930,7 @@ static int update_clone_task_finished(int result,
|
|||
const struct cache_entry *ce;
|
||||
struct submodule_update_clone *suc = suc_cb;
|
||||
|
||||
int *idxP = *(int**)idx_task_cb;
|
||||
int *idxP = idx_task_cb;
|
||||
int idx = *idxP;
|
||||
free(idxP);
|
||||
|
||||
|
|
|
@ -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;
|
||||
|
|
Loading…
Reference in a new issue