undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

builtin/help.c: call load_command_list() only when it is needed

Browse Source 
This avoids list_commands_in_dir() being called when not needed which is
quite slow due to file I/O in order to list matching files in a directory.

Signed-off-by: Sebastian Schuberth <sschuberth@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Sebastian Schuberth 2014-01-02 17:16:30 +01:00 committed by Junio C Hamano
parent 3f784a4dcb
commit a3c5263438
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
builtin/help.c
View File

@ -288,6 +288,7 @@ static struct cmdnames main_cmds, other_cmds;
static int is_git_command(const char *s) static int is_git_command(const char *s)
{ {
load_command_list("git-", &main_cmds, &other_cmds);
return is_in_cmdlist(&main_cmds, s) || return is_in_cmdlist(&main_cmds, s) ||
is_in_cmdlist(&other_cmds, s); is_in_cmdlist(&other_cmds, s);
} }
@ -449,7 +450,6 @@ int cmd_help(int argc, const char **argv, const char *prefix)
int nongit; int nongit;
const char *alias; const char *alias;
enum help_format parsed_help_format; enum help_format parsed_help_format;
load_command_list("git-", &main_cmds, &other_cmds);
argc = parse_options(argc, argv, prefix, builtin_help_options, argc = parse_options(argc, argv, prefix, builtin_help_options,
builtin_help_usage, 0); builtin_help_usage, 0);
@ -458,6 +458,7 @@ int cmd_help(int argc, const char **argv, const char *prefix)
if (show_all) { if (show_all) {
git_config(git_help_config, NULL); git_config(git_help_config, NULL);
printf(_("usage: %s%s"), _(git_usage_string), "\n\n"); printf(_("usage: %s%s"), _(git_usage_string), "\n\n");
load_command_list("git-", &main_cmds, &other_cmds);
list_commands(colopts, &main_cmds, &other_cmds); list_commands(colopts, &main_cmds, &other_cmds);
} }