From: Miklos Vajna Date: Wed, 30 Jul 2008 22:38:07 +0000 (+0200) Subject: builtin-help: always load_command_list() in cmd_help() X-Git-Tag: v1.6.1-rc1~294^2~4 X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=6e4a86d2ed2d798c5462e5e324fefb8614be52a8;p=git.git builtin-help: always load_command_list() in cmd_help() When cmd_help() is called, we always need the list of main and other commands, not just when the list of all commands is shown. Before this patch 'git help diff' invoked 'man gitdiff' because cmd_to_page() thought 'diff' is not a git command. Signed-off-by: Miklos Vajna Signed-off-by: Junio C Hamano --- diff --git a/help.c b/help.c index 88c0d5b34..968f3683e 100644 --- a/help.c +++ b/help.c @@ -690,6 +690,7 @@ int cmd_help(int argc, const char **argv, const char *prefix) { int nongit; const char *alias; + unsigned int longest = load_command_list("git-", &main_cmds, &other_cmds); setup_git_directory_gently(&nongit); git_config(git_help_config, NULL); @@ -698,7 +699,6 @@ int cmd_help(int argc, const char **argv, const char *prefix) builtin_help_usage, 0); if (show_all) { - unsigned int longest = load_command_list("git-", &main_cmds, &other_cmds); printf("usage: %s\n\n", git_usage_string); list_commands("git commands", longest, &main_cmds, &other_cmds); printf("%s\n", git_more_info_string);