revision --simplify-merges: use decoration instead of commit->util field

diff --git a/shell.c b/shell.c
index 9826109d5b1b3746aea33dc6b7ebe7b6da19bd22..6a48de05ff80f86050715ef3dab87a48b0a86ac9 100644 (file)
--- a/shell.c
+++ b/shell.c
@@ -3,10 +3,19 @@
 #include "exec_cmd.h"
 #include "strbuf.h"
 
+/* Stubs for functions that make no sense for git-shell. These stubs
+ * are provided here to avoid linking in external redundant modules.
+ */
+void release_pack_memory(size_t need, int fd){}
+void trace_argv_printf(const char **argv, const char *fmt, ...){}
+void trace_printf(const char *fmt, ...){}
+
+
 static int do_generic_cmd(const char *me, char *arg)
 {
        const char *my_argv[4];
 
+       setup_path();
        if (!arg || !(arg = sq_dequote(arg)))
                die("bad argument");
        if (prefixcmp(me, "git-"))
@@ -28,8 +37,7 @@ static int do_cvs_cmd(const char *me, char *arg)
        if (!arg || strcmp(arg, "server"))
                die("git-cvsserver only handles server: %s", arg);
 
-       setup_path(NULL);
-
+       setup_path();
        return execv_git_cmd(cvsserver_argv);
 }
 
@@ -49,15 +57,24 @@ int main(int argc, char **argv)
        char *prog;
        struct commands *cmd;
 
+       /*
+        * Special hack to pretend to be a CVS server
+        */
        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];
-       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;