Merge branch 'jc/archive'

diff --git a/git.c b/git.c
index a01d195c2319fd21fb361e535c5d6333550e3dbd..70cafb02625016943f03622ff37949d8f64cdcfb 100644 (file)
--- a/git.c
+++ b/git.c
@@ -29,13 +29,15 @@ static void prepend_to_path(const char *dir, int len)
 
        path_len = len + strlen(old_path) + 1;
 
-       path = malloc(path_len + 1);
+       path = xmalloc(path_len + 1);
 
        memcpy(path, dir, len);
        path[len] = ':';
        memcpy(path + len + 1, old_path, path_len - len);
 
        setenv("PATH", path, 1);
+
+       free(path);
 }
 
 static int handle_options(const char*** argv, int* argc)
@@ -97,7 +99,7 @@ static char *alias_string;
 static int git_alias_config(const char *var, const char *value)
 {
        if (!strncmp(var, "alias.", 6) && !strcmp(var + 6, alias_command)) {
-               alias_string = strdup(value);
+               alias_string = xstrdup(value);
        }
        return 0;
 }
@@ -120,7 +122,7 @@ static int split_cmdline(char *cmdline, const char ***argv)
                                ; /* skip */
                        if (count >= size) {
                                size += 16;
-                               *argv = realloc(*argv, sizeof(char*) * size);
+                               *argv = xrealloc(*argv, sizeof(char*) * size);
                        }
                        (*argv)[count++] = cmdline + dst;
                } else if(!quoted && (c == '\'' || c == '"')) {
@@ -179,20 +181,12 @@ 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);
-               }
+               trace_argv_printf(new_argv, count,
+                                 "trace: alias expansion: %s =>",
+                                 alias_command);
 
-               new_argv = realloc(new_argv, sizeof(char*) *
-                                  (count + *argcp + 1));
+               new_argv = xrealloc(new_argv, sizeof(char*) *
+                                   (count + *argcp + 1));
                /* insert after command name */
                memcpy(new_argv + count, *argv + 1, sizeof(char*) * *argcp);
                new_argv[count+*argcp] = NULL;
@@ -226,11 +220,12 @@ static void handle_internal_command(int argc, const char **argv, char **envp)
        } commands[] = {
                { "add", cmd_add, RUN_SETUP },
                { "apply", cmd_apply },
+               { "archive", cmd_archive },
                { "cat-file", cmd_cat_file, RUN_SETUP },
                { "checkout-index", cmd_checkout_index, RUN_SETUP },
                { "check-ref-format", cmd_check_ref_format },
                { "commit-tree", cmd_commit_tree, RUN_SETUP },
-               { "count-objects", cmd_count_objects },
+               { "count-objects", cmd_count_objects, RUN_SETUP },
                { "diff", cmd_diff, RUN_SETUP },
                { "diff-files", cmd_diff_files, RUN_SETUP },
                { "diff-index", cmd_diff_index, RUN_SETUP },
@@ -263,9 +258,11 @@ static void handle_internal_command(int argc, const char **argv, char **envp)
                { "stripspace", cmd_stripspace },
                { "symbolic-ref", cmd_symbolic_ref, RUN_SETUP },
                { "tar-tree", cmd_tar_tree, RUN_SETUP },
+               { "zip-tree", cmd_zip_tree, RUN_SETUP },
                { "unpack-objects", cmd_unpack_objects, RUN_SETUP },
                { "update-index", cmd_update_index, RUN_SETUP },
                { "update-ref", cmd_update_ref, RUN_SETUP },
+               { "upload-archive", cmd_upload_archive },
                { "upload-tar", cmd_upload_tar },
                { "version", cmd_version },
                { "whatchanged", cmd_whatchanged, RUN_SETUP | USE_PAGER },
@@ -291,16 +288,7 @@ static void handle_internal_command(int argc, const char **argv, char **envp)
                        prefix = setup_git_directory();
                if (p->option & USE_PAGER)
                        setup_pager();
-               if (getenv("GIT_TRACE")) {
-                       int j;
-                       fprintf(stderr, "trace: built-in: git");
-                       for (j = 0; j < argc; ++j) {
-                               fputc(' ', stderr);
-                               sq_quote_print(stderr, argv[j]);
-                       }
-                       putc('\n', stderr);
-                       fflush(stderr);
-               }
+               trace_argv_printf(argv, argc, "trace: built-in: git");
 
                exit(p->fn(argc, argv, prefix));
        }
@@ -308,7 +296,7 @@ static void handle_internal_command(int argc, const char **argv, char **envp)
 
 int main(int argc, const char **argv, char **envp)
 {
-       const char *cmd = argv[0];
+       const char *cmd = argv[0] ? argv[0] : "git-help";
        char *slash = strrchr(cmd, '/');
        const char *exec_path = NULL;
        int done_alias = 0;