diff options
| author | Junio C Hamano <gitster@pobox.com> | 2016-03-04 13:46:30 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-03-04 13:46:30 -0800 |
| commit | bbe90e7950456bf1bb1ab17a9ee626f6fad7a7c6 (patch) | |
| tree | 9492660cef03802ccee18d814bfed3d1aad5b1d5 /submodule.c | |
| parent | 6dd0a37c34e79e38aa611fce10dd5609ccc7c39a (diff) | |
| parent | 2a73b3dad09ef162eb5917e9e0d01d7c306f6b35 (diff) | |
| download | git-bbe90e7950456bf1bb1ab17a9ee626f6fad7a7c6.tar.gz | |
Merge branch 'sb/submodule-parallel-fetch'
Simplify the two callback functions that are triggered when the
child process terminates to avoid misuse of the child-process
structure that has already been cleaned up.
* sb/submodule-parallel-fetch:
run-command: do not pass child process data into callbacks
Diffstat (limited to 'submodule.c')
| -rw-r--r-- | submodule.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/submodule.c b/submodule.c index 24fb81ac62..62c4356c50 100644 --- a/submodule.c +++ b/submodule.c @@ -705,8 +705,7 @@ static int get_next_submodule(struct child_process *cp, return 0; } -static int fetch_start_failure(struct child_process *cp, - struct strbuf *err, +static int fetch_start_failure(struct strbuf *err, void *cb, void *task_cb) { struct submodule_parallel_fetch *spf = cb; @@ -716,8 +715,8 @@ static int fetch_start_failure(struct child_process *cp, return 0; } -static int fetch_finish(int retvalue, struct child_process *cp, - struct strbuf *err, void *cb, void *task_cb) +static int fetch_finish(int retvalue, struct strbuf *err, + void *cb, void *task_cb) { struct submodule_parallel_fetch *spf = cb; |