Merge branch 'jk/rebase-i-drop-ident-check' into maint

diff --git a/t/helper/test-run-command.c b/t/helper/test-run-command.c
index 6bb53da3c0faef2989d749d3df5c26ca3cd76b4a..d24d157379f30cafdeeb772e82bf5ee4c862272c 100644 (file)
--- a/t/helper/test-run-command.c
+++ b/t/helper/test-run-command.c
@@ -49,7 +49,7 @@ static int task_finished(int result,
        return 1;
 }
 
-int main(int argc, char **argv)
+int cmd_main(int argc, const char **argv)
 {
        struct child_process proc = CHILD_PROCESS_INIT;
        int jobs;