Merge branch 'maint'

diff --git a/shell.c b/shell.c
index fc0c73cde7370801a0695befbf0e2610d2ea7ef1..c983fc7b86ed3c7792d4e325e4b88845719494d1 100644 (file)
--- a/shell.c
+++ b/shell.c
@@ -8,14 +8,14 @@ static int do_generic_cmd(const char *me, char *arg)
 
        if (!arg || !(arg = sq_dequote(arg)))
                die("bad argument");
-       if (strncmp(me, "git-", 4))
+       if (prefixcmp(me, "git-"))
                die("bad command");
 
        my_argv[0] = me + 4;
        my_argv[1] = arg;
        my_argv[2] = NULL;
 
-       return execv_git_cmd((char**) my_argv);
+       return execv_git_cmd(my_argv);
 }
 
 static struct commands {