Merge branch 'sb/merge-friendly'

diff --git a/shell.c b/shell.c
index fc0c73cde7370801a0695befbf0e2610d2ea7ef1..8c08cf0fb339d293383c3dacb8cdfc805afa3727 100644 (file)
--- a/shell.c
+++ b/shell.c
@@ -15,7 +15,7 @@ static int do_generic_cmd(const char *me, char *arg)
        my_argv[1] = arg;
        my_argv[2] = NULL;
 
-       return execv_git_cmd((char**) my_argv);
+       return execv_git_cmd(my_argv);
 }
 
 static struct commands {