git-mv: succeed even if source is a prefix of destination

diff --git a/git.c b/git.c
index 79db43e143b289d7e6857ee59cd8b68c7d656b49..18ba14ade1bb60b59fd0288130ba098e9e76dac3 100644 (file)
--- a/git.c
+++ b/git.c
@@ -15,6 +15,9 @@
 
 #include "builtin.h"
 
+const char git_usage_string[] =
+       "git [--version] [--exec-path[=GIT_EXEC_PATH]] [--help] COMMAND [ ARGS ]";
+
 static void prepend_to_path(const char *dir, int len)
 {
        const char *old_path = getenv("PATH");
@@ -78,7 +81,7 @@ static int handle_options(const char*** argv, int* argc)
                        setenv("GIT_DIR", getcwd(git_dir, 1024), 1);
                } else {
                        fprintf(stderr, "Unknown option: %s\n", cmd);
-                       cmd_usage(0, NULL, NULL);
+                       usage(git_usage_string);
                }
 
                (*argv)++;
@@ -156,52 +159,48 @@ static int handle_alias(int *argcp, const char ***argv)
 {
        int nongit = 0, ret = 0, saved_errno = errno;
        const char *subdir;
+       int count, option_count;
+       const char** new_argv;
 
        subdir = setup_git_directory_gently(&nongit);
-       if (!nongit) {
-               int count, option_count;
-               const char** new_argv;
-
-               alias_command = (*argv)[0];
-               git_config(git_alias_config);
-               if (alias_string) {
-
-                       count = split_cmdline(alias_string, &new_argv);
-                       option_count = handle_options(&new_argv, &count);
-                       memmove(new_argv - option_count, new_argv,
-                                       count * sizeof(char *));
-                       new_argv -= option_count;
-
-                       if (count < 1)
-                               die("empty alias for %s", alias_command);
-
-                       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);
-                       }
 
-                       new_argv = realloc(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;
+       alias_command = (*argv)[0];
+       git_config(git_alias_config);
+       if (alias_string) {
+               count = split_cmdline(alias_string, &new_argv);
+               option_count = handle_options(&new_argv, &count);
+               memmove(new_argv - option_count, new_argv,
+                               count * sizeof(char *));
+               new_argv -= option_count;
+
+               if (count < 1)
+                       die("empty alias for %s", alias_command);
 
-                       *argv = new_argv;
-                       *argcp += count - 1;
+               if (!strcmp(alias_command, new_argv[0]))
+                       die("recursive alias: %s", alias_command);
 
-                       ret = 1;
+               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);
                }
+
+               new_argv = realloc(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;
+
+               *argv = new_argv;
+               *argcp += count - 1;
+
+               ret = 1;
        }
 
        if (subdir)
@@ -215,6 +214,7 @@ static int handle_alias(int *argcp, const char ***argv)
 const char git_version_string[] = GIT_VERSION;
 
 #define NEEDS_PREFIX 1
+#define USE_PAGER 2
 
 static void handle_internal_command(int argc, const char **argv, char **envp)
 {
@@ -222,14 +222,14 @@ static void handle_internal_command(int argc, const char **argv, char **envp)
        static struct cmd_struct {
                const char *cmd;
                int (*fn)(int, const char **, const char *);
-               int prefix;
+               int option;
        } commands[] = {
                { "version", cmd_version },
                { "help", cmd_help },
-               { "log", cmd_log, NEEDS_PREFIX },
-               { "whatchanged", cmd_whatchanged, NEEDS_PREFIX },
-               { "show", cmd_show, NEEDS_PREFIX },
-               { "push", cmd_push },
+               { "log", cmd_log, NEEDS_PREFIX | USE_PAGER },
+               { "whatchanged", cmd_whatchanged, NEEDS_PREFIX | USE_PAGER },
+               { "show", cmd_show, NEEDS_PREFIX | USE_PAGER },
+               { "push", cmd_push, NEEDS_PREFIX },
                { "format-patch", cmd_format_patch, NEEDS_PREFIX },
                { "count-objects", cmd_count_objects },
                { "diff", cmd_diff, NEEDS_PREFIX },
@@ -262,6 +262,9 @@ static void handle_internal_command(int argc, const char **argv, char **envp)
                { "update-ref", cmd_update_ref, NEEDS_PREFIX },
                { "fmt-merge-msg", cmd_fmt_merge_msg, NEEDS_PREFIX },
                { "prune", cmd_prune, NEEDS_PREFIX },
+               { "mv", cmd_mv, NEEDS_PREFIX },
+               { "prune-packed", cmd_prune_packed, NEEDS_PREFIX },
+               { "repo-config", cmd_repo_config },
        };
        int i;
 
@@ -278,8 +281,10 @@ static void handle_internal_command(int argc, const char **argv, char **envp)
                        continue;
 
                prefix = NULL;
-               if (p->prefix)
+               if (p->option & NEEDS_PREFIX)
                        prefix = setup_git_directory();
+               if (p->option & USE_PAGER)
+                       setup_pager();
                if (getenv("GIT_TRACE")) {
                        int i;
                        fprintf(stderr, "trace: built-in: git");
@@ -375,7 +380,7 @@ int main(int argc, const char **argv, char **envp)
        }
 
        if (errno == ENOENT)
-               cmd_usage(0, exec_path, "'%s' is not a git-command", cmd);
+               help_unknown_cmd(cmd);
 
        fprintf(stderr, "Failed to run command '%s': %s\n",
                cmd, strerror(errno));