traverse_trees(): handle D/F conflict case sanely

diff --git a/shell.c b/shell.c
index 0f6a727a8c267cdeb3a93c30bc688bb64ecd8003..e4864e04da3b0e237342c2ca0548c0ec0082c171 100644 (file)
--- a/shell.c
+++ b/shell.c
@@ -40,6 +40,7 @@ static struct commands {
 } cmd_list[] = {
        { "git-receive-pack", do_generic_cmd },
        { "git-upload-pack", do_generic_cmd },
+       { "git-upload-archive", do_generic_cmd },
        { "cvs", do_cvs_cmd },
        { NULL },
 };
@@ -48,6 +49,19 @@ int main(int argc, char **argv)
 {
        char *prog;
        struct commands *cmd;
+       int devnull_fd;
+
+       /*
+        * Always open file descriptors 0/1/2 to avoid clobbering files
+        * in die().  It also avoids not messing up when the pipes are
+        * dup'ed onto stdin/stdout/stderr in the child processes we spawn.
+        */
+       devnull_fd = open("/dev/null", O_RDWR);
+       while (devnull_fd >= 0 && devnull_fd <= 2)
+               devnull_fd = dup(devnull_fd);
+       if (devnull_fd == -1)
+               die_errno("opening /dev/null failed");
+       close (devnull_fd);
 
        /*
         * Special hack to pretend to be a CVS server