git-shell: accept "git foo" form

This is a backport of 0a47dc110e042b5bcc63dc94c8d517e67efe9306
to 'maint' to be included in 1.5.6.2 so that older server side
can accept dashless form of request when clients are updated.

Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/shell.c b/shell.c
index 9826109d5b1b3746aea33dc6b7ebe7b6da19bd22..b27d01c9e4ca51dc3259994da47f4d9a6e8344c3 100644 (file)
--- a/shell.c
+++ b/shell.c
@@ -7,6 +7,7 @@ static int do_generic_cmd(const char *me, char *arg)
 {
        const char *my_argv[4];
 
 {
        const char *my_argv[4];
 

+       setup_path(NULL);

        if (!arg || !(arg = sq_dequote(arg)))
                die("bad argument");
        if (prefixcmp(me, "git-"))
        if (!arg || !(arg = sq_dequote(arg)))
                die("bad argument");
        if (prefixcmp(me, "git-"))


@@ -29,7 +30,6 @@ static int do_cvs_cmd(const char *me, char *arg)
                die("git-cvsserver only handles server: %s", arg);
 
        setup_path(NULL);
                die("git-cvsserver only handles server: %s", arg);
 
        setup_path(NULL);

-

        return execv_git_cmd(cvsserver_argv);
 }
 
        return execv_git_cmd(cvsserver_argv);
 }
 


@@ -49,15 +49,24 @@ int main(int argc, char **argv)
        char *prog;
        struct commands *cmd;
 
        char *prog;
        struct commands *cmd;
 

+       /*
+        * Special hack to pretend to be a CVS server
+        */

        if (argc == 2 && !strcmp(argv[1], "cvs server"))
                argv--;
        if (argc == 2 && !strcmp(argv[1], "cvs server"))
                argv--;

-       /* We want to see "-c cmd args", and nothing else */
+
+       /*
+        * We do not accept anything but "-c" followed by "cmd arg",
+        * where "cmd" is a very limited subset of git commands.
+        */

        else if (argc != 3 || strcmp(argv[1], "-c"))
                die("What do you think I am? A shell?");
 
        prog = argv[2];
        else if (argc != 3 || strcmp(argv[1], "-c"))
                die("What do you think I am? A shell?");
 
        prog = argv[2];

-       argv += 2;
-       argc -= 2;
+       if (!strncmp(prog, "git", 3) && isspace(prog[3]))
+               /* Accept "git foo" as if the caller said "git-foo". */
+               prog[3] = '-';
+

        for (cmd = cmd_list ; cmd->name ; cmd++) {
                int len = strlen(cmd->name);
                char *arg;
        for (cmd = cmd_list ; cmd->name ; cmd++) {
                int len = strlen(cmd->name);
                char *arg;