OSDN Git Service
(root)
/
git-core
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'ar/request-pull-phrasofix' into maint
[git-core/git.git]
/
run-command.c
diff --git
a/run-command.c
b/run-command.c
index
9e36151
..
b5e6eb3
100644
(file)
--- 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,
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)
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,
code = pp->task_finished(code,
&pp->children[i].err, pp->data,
-
&
pp->children[i].data);
+ pp->children[i].data);
if (code)
result = code;
if (code)
result = code;