Browse Source

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
maint
Junio C Hamano 7 years ago
parent
commit
0869277033
  1. 2
      builtin/submodule--helper.c
  2. 4
      run-command.c

2
builtin/submodule--helper.c

@ -930,7 +930,7 @@ static int update_clone_task_finished(int result,
const struct cache_entry *ce; const struct cache_entry *ce;
struct submodule_update_clone *suc = suc_cb; struct submodule_update_clone *suc = suc_cb;


int *idxP = *(int**)idx_task_cb; int *idxP = idx_task_cb;
int idx = *idxP; int idx = *idxP;
free(idxP); free(idxP);



4
run-command.c

@ -1533,7 +1533,7 @@ static int pp_start_one(struct parallel_processes *pp)
if (start_command(&pp->children[i].process)) { if (start_command(&pp->children[i].process)) {
code = pp->start_failure(&pp->children[i].err, code = pp->start_failure(&pp->children[i].err,
pp->data, pp->data,
&pp->children[i].data); pp->children[i].data);
strbuf_addbuf(&pp->buffered_output, &pp->children[i].err); strbuf_addbuf(&pp->buffered_output, &pp->children[i].err);
strbuf_reset(&pp->children[i].err); strbuf_reset(&pp->children[i].err);
if (code) if (code)
@ -1601,7 +1601,7 @@ static int pp_collect_finished(struct parallel_processes *pp)


code = pp->task_finished(code, code = pp->task_finished(code,
&pp->children[i].err, pp->data, &pp->children[i].err, pp->data,
&pp->children[i].data); pp->children[i].data);


if (code) if (code)
result = code; result = code;

Loading…
Cancel
Save