[PATCH 2/2] SQUASH for "fetch_populated_submodules: use new parallel job processing"

[Stefan Beller]

This fixes the function signature in the first user of the async run processor.

Signed-off-by: Stefan Beller <sbel...@google.com>
---
 submodule.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/submodule.c b/submodule.c
index d7c7a6e..2c4396b 100644
--- a/submodule.c
+++ b/submodule.c
@@ -630,13 +630,15 @@ struct submodule_parallel_fetch {
 int get_next_submodule(void *data, struct child_process *cp,
                       struct strbuf *err);
 
-void handle_submodule_fetch_start_err(void *data, struct child_process *cp, 
struct strbuf *err)
+void handle_submodule_fetch_start_err(void *data, struct child_process *cp,
+                                     struct strbuf *err)
 {
        struct submodule_parallel_fetch *spf = data;
        spf->result = 1;
 }
 
-void handle_submodule_fetch_finish( void *data, struct child_process *cp, int 
retvalue)
+void handle_submodule_fetch_finish(void *data, struct child_process *cp,
+                                  struct strbuf *err, int retvalue)
 {
        struct submodule_parallel_fetch *spf = data;
 
-- 
2.5.0.273.g6fa2560.dirty

--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html