merge-recur: Get rid of debug code

diff --git a/git.c b/git.c
index 49062ca66e4f37d53f16d4bff10dc71b1c97e6db..102735af6c0cfb496a04593ba466a9fbb18f693d 100644 (file)
--- a/git.c
+++ b/git.c
@@ -11,6 +11,7 @@
 #include "git-compat-util.h"
 #include "exec_cmd.h"
 #include "cache.h"
+#include "quote.h"
 
 #include "builtin.h"
 
@@ -120,6 +121,18 @@ static int handle_alias(int *argcp, const char ***argv)
                        if (!strcmp(alias_command, new_argv[0]))
                                die("recursive alias: %s", alias_command);
 
+                       if (getenv("GIT_TRACE")) {
+                               int i;
+                               fprintf(stderr, "trace: alias expansion: %s =>",
+                                       alias_command);
+                               for (i = 0; i < count; ++i) {
+                                       fputc(' ', stderr);
+                                       sq_quote_print(stderr, new_argv[i]);
+                               }
+                               fputc('\n', stderr);
+                               fflush(stderr);
+                       }
+
                        /* insert after command name */
                        if (*argcp > 1) {
                                new_argv = realloc(new_argv, sizeof(char*) *
@@ -188,7 +201,8 @@ static void handle_internal_command(int argc, const char **argv, char **envp)
                { "stripspace", cmd_stripspace },
                { "update-index", cmd_update_index },
                { "update-ref", cmd_update_ref },
-               { "fmt-merge-msg", cmd_fmt_merge_msg }
+               { "fmt-merge-msg", cmd_fmt_merge_msg },
+               { "prune", cmd_prune },
        };
        int i;
 
@@ -202,6 +216,18 @@ static void handle_internal_command(int argc, const char **argv, char **envp)
                struct cmd_struct *p = commands+i;
                if (strcmp(p->cmd, cmd))
                        continue;
+
+               if (getenv("GIT_TRACE")) {
+                       int i;
+                       fprintf(stderr, "trace: built-in: git");
+                       for (i = 0; i < argc; ++i) {
+                               fputc(' ', stderr);
+                               sq_quote_print(stderr, argv[i]);
+                       }
+                       putc('\n', stderr);
+                       fflush(stderr);
+               }
+
                exit(p->fn(argc, argv, envp));
        }
 }