From: Kevin Ballard <kevin@sb.org>
Date: Wed, 30 Jul 2008 22:50:46 GMT
Subject: Re: [PATCH] builtin-help: always load_command_list() in cmd_help()
Message-ID: <871A4541-3980-4C82-8A4A-CF9BE066946D@sb.org>
In-Reply-To: <1217457487-6509-1-git-send-email-vmiklos@frugalware.org>

This patch works great for me.

Heck, after these help changes, git-help behaves even better in its  
error message.

 > git help merge-recursive
No manual entry for git-merge-recursive
 > git help sdfkjl
No manual entry for gitsdfkjl

It used to complain No manual entry for gitmerge-recursive.

Acked-by: Kevin Ballard <kevin@sb.org>

-Kevin Ballard

On Jul 30, 2008, at 3:38 PM, Miklos Vajna wrote:

> 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>
> ---
>
> On Wed, Jul 30, 2008 at 01:52:26PM -0700, Kevin Ballard  
> <kevin@sb.org> wrote:
>> `git help diff` no longer finds the git-diff manpage (as of tip of
>> next branch). I haven't tested, but I suspect
>> 940208a771066229bc6a486f6a058e332b71cfe4 is responsible.
>
> This fixed the issue for me.
>
> Thanks!
>
> help.c |    2 +-
> 1 files changed, 1 insertions(+), 1 deletions(-)
>
> diff --git a/help.c b/help.c
> index 88c0d5b..968f368 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);
> -- 
> 1.6.0.rc0.14.g95f8.dirty
>

-- 
Kevin Ballard
http://kevin.sb.org
kevin@sb.org
http://www.tildesoft.com