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

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>

diff --git a/builtin/help.c b/builtin/help.c
index cc17e670ceb458491cc47e463b970b6d4c6143f8..b6fc15e5b06be6c9c89f2375f5f812c101dc43f2 100644 (file)
--- a/builtin/help.c
+++ b/builtin/help.c
@@ -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) ||
                is_in_cmdlist(&other_cmds, s);
 }
        return is_in_cmdlist(&main_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;
        const char *alias;
        enum help_format parsed_help_format;
        int nongit;
        const char *alias;
        enum help_format parsed_help_format;

-       load_command_list("git-", &main_cmds, &other_cmds);

 
        argc = parse_options(argc, argv, prefix, builtin_help_options,
                        builtin_help_usage, 0);
 
        argc = parse_options(argc, argv, prefix, builtin_help_options,
                        builtin_help_usage, 0);


@@ -458,6 +458,7 @@ int cmd_help(int argc, const char **argv, const char *prefix)
        if (show_all) {
                git_config(git_help_config, NULL);
                printf(_("usage: %s%s"), _(git_usage_string), "\n\n");
        if (show_all) {
                git_config(git_help_config, NULL);
                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);
        }