mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'sb/submodule-parallel-fetch'

Browse Source 
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
This commit is contained in:
Junio C Hamano
2016-03-04 13:46:30 -08:00
parent 6dd0a37c34 2a73b3dad0
commit bbe90e7950
4 changed files with 9 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
submodule.c
View File

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