Merge branch 'master' into js/c-merge-recursive

[git.git] / git.c

diff --git a/git.c b/git.c
index d031eb9a1868befaa546e230579152b35591054e..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)++;
@@ -226,7 +229,7 @@ static void handle_internal_command(int argc, const char **argv, char **envp)
                { "log", cmd_log, NEEDS_PREFIX | USE_PAGER },
                { "whatchanged", cmd_whatchanged, NEEDS_PREFIX | USE_PAGER },
                { "show", cmd_show, NEEDS_PREFIX | USE_PAGER },
-               { "push", cmd_push },
+               { "push", cmd_push, NEEDS_PREFIX },
                { "format-patch", cmd_format_patch, NEEDS_PREFIX },
                { "count-objects", cmd_count_objects },
                { "diff", cmd_diff, NEEDS_PREFIX },
@@ -260,6 +263,8 @@ static void handle_internal_command(int argc, const char **argv, char **envp)
                { "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;
 
@@ -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));