Merge branch 'js/fmt-merge-msg'

diff --git a/git.c b/git.c
index 6db8f2bc23abb328d8d0bed83a581a1cda10e9a4..256730112e56e19e5df70f2bef4e3efdb1a5e362 100644 (file)
--- a/git.c
+++ b/git.c
@@ -16,7 +16,8 @@
 
 static void prepend_to_path(const char *dir, int len)
 {
-       char *path, *old_path = getenv("PATH");
+       const char *old_path = getenv("PATH");
+       char *path;
        int path_len = len;
 
        if (!old_path)
@@ -99,7 +100,7 @@ static int split_cmdline(char *cmdline, const char ***argv)
 
 static int handle_alias(int *argcp, const char ***argv)
 {
-       int nongit = 0, ret = 0;
+       int nongit = 0, ret = 0, saved_errno = errno;
        const char *subdir;
 
        subdir = setup_git_directory_gently(&nongit);
@@ -122,9 +123,9 @@ static int handle_alias(int *argcp, const char ***argv)
                        /* insert after command name */
                        if (*argcp > 1) {
                                new_argv = realloc(new_argv, sizeof(char*) *
-                                               (count + *argcp - 1));
-                               memcpy(new_argv + count, *argv, sizeof(char*) *
-                                               (*argcp - 1));
+                                                  (count + *argcp));
+                               memcpy(new_argv + count, *argv + 1,
+                                      sizeof(char*) * *argcp);
                        }
 
                        *argv = new_argv;
@@ -137,6 +138,8 @@ static int handle_alias(int *argcp, const char ***argv)
        if (subdir)
                chdir(subdir);
 
+       errno = saved_errno;
+
        return ret;
 }
 
@@ -163,7 +166,7 @@ static void handle_internal_command(int argc, const char **argv, char **envp)
                { "add", cmd_add },
                { "rev-list", cmd_rev_list },
                { "init-db", cmd_init_db },
-               { "tar-tree", cmd_tar_tree },
+               { "get-tar-commit-id", cmd_get_tar_commit_id },
                { "upload-tar", cmd_upload_tar },
                { "check-ref-format", cmd_check_ref_format },
                { "ls-files", cmd_ls_files },
@@ -178,7 +181,14 @@ static void handle_internal_command(int argc, const char **argv, char **envp)
                { "diff-stages", cmd_diff_stages },
                { "diff-tree", cmd_diff_tree },
                { "cat-file", cmd_cat_file },
-               { "rev-parse", cmd_rev_parse }
+               { "rev-parse", cmd_rev_parse },
+               { "write-tree", cmd_write_tree },
+               { "mailsplit", cmd_mailsplit },
+               { "mailinfo", cmd_mailinfo },
+               { "stripspace", cmd_stripspace },
+               { "update-index", cmd_update_index },
+               { "update-ref", cmd_update_ref },
+               { "fmt-merge-msg", cmd_fmt_merge_msg }
        };
        int i;
 
@@ -200,7 +210,6 @@ int main(int argc, const char **argv, char **envp)
 {
        const char *cmd = argv[0];
        char *slash = strrchr(cmd, '/');
-       char git_command[PATH_MAX + 1];
        const char *exec_path = NULL;
        int done_alias = 0;
 
@@ -307,7 +316,7 @@ int main(int argc, const char **argv, char **envp)
                cmd_usage(0, exec_path, "'%s' is not a git-command", cmd);
 
        fprintf(stderr, "Failed to run command '%s': %s\n",
-               git_command, strerror(errno));
+               cmd, strerror(errno));
 
        return 1;
 }