Browse Source

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 <vmiklos@frugalware.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
maint
Miklos Vajna 17 years ago committed by Junio C Hamano
parent
commit
6e4a86d2ed
  1. 2
      help.c

2
help.c

@ -690,6 +690,7 @@ int cmd_help(int argc, const char **argv, const char *prefix)
{ {
int nongit; int nongit;
const char *alias; const char *alias;
unsigned int longest = load_command_list("git-", &main_cmds, &other_cmds);


setup_git_directory_gently(&nongit); setup_git_directory_gently(&nongit);
git_config(git_help_config, NULL); 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); builtin_help_usage, 0);


if (show_all) { if (show_all) {
unsigned int longest = load_command_list("git-", &main_cmds, &other_cmds);
printf("usage: %s\n\n", git_usage_string); printf("usage: %s\n\n", git_usage_string);
list_commands("git commands", longest, &main_cmds, &other_cmds); list_commands("git commands", longest, &main_cmds, &other_cmds);
printf("%s\n", git_more_info_string); printf("%s\n", git_more_info_string);

Loading…
Cancel
Save