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

sschuberth · gitster · commit a3c5263438f7 · 2014-01-06T11:26:10.000-08:00
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 &lt;sschuberth@gmail.com&gt;
Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
diff --git 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)
 {
+	load_command_list("git-", &main_cmds, &other_cmds);
 	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;
-	load_command_list("git-", &main_cmds, &other_cmds);
 
 	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");
+		load_command_list("git-", &main_cmds, &other_cmds);
 		list_commands(colopts, &main_cmds, &other_cmds);
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -288,6 +288,7 @@ static struct cmdnames main_cmds, other_cmds;`
`288`	`288`
`289`	`289`	`static int is_git_command(const char *s)`
`290`	`290`	`{`
	`291`	`+ load_command_list("git-", &main_cmds, &other_cmds);`
`291`	`292`	`return is_in_cmdlist(&main_cmds, s) \|\|`
`292`	`293`	`is_in_cmdlist(&other_cmds, s);`
`293`	`294`	`}`
`@@ -449,7 +450,6 @@ int cmd_help(int argc, const char *argv, const char prefix)`
`449`	`450`	`int nongit;`
`450`	`451`	`const char *alias;`
`451`	`452`	`enum help_format parsed_help_format;`
`452`		`- load_command_list("git-", &main_cmds, &other_cmds);`
`453`	`453`
`454`	`454`	`argc = parse_options(argc, argv, prefix, builtin_help_options,`
`455`	`455`	`builtin_help_usage, 0);`
`@@ -458,6 +458,7 @@ int cmd_help(int argc, const char *argv, const char prefix)`
`458`	`458`	`if (show_all) {`
`459`	`459`	`git_config(git_help_config, NULL);`
`460`	`460`	`printf(_("usage: %s%s"), _(git_usage_string), "\n\n");`
	`461`	`+ load_command_list("git-", &main_cmds, &other_cmds);`
`461`	`462`	`list_commands(colopts, &main_cmds, &other_cmds);`
`462`	`463`	`}`
`463`	`464`