Merge branch 'ss/msvc' into maint

diff --git a/test-run-command.c b/test-run-command.c
index fbe0a27ef3295fe3312fb72a478571bfb450cb25..30a64a98dc8b53a3a2d7edfaa57a8ee51d5d63e7 100644 (file)
--- a/test-run-command.c
+++ b/test-run-command.c
@@ -41,7 +41,6 @@ static int no_job(struct child_process *cp,
 }
 
 static int task_finished(int result,
-                        struct child_process *cp,
                         struct strbuf *err,
                         void *pp_cb,
                         void *pp_task_cb)