undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'js/run-process-parallel-api-fix' into maint

Browse Source 
API fix.

* js/run-process-parallel-api-fix:
  run_processes_parallel: change confusing task_cb convention
This commit is contained in:
Junio C Hamano 2017-08-23 14:33:49 -07:00
commit 0869277033
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
builtin/submodule--helper.c
View File

@ -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
View File

@ -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;