Re: [PATCH V3 2/5] Help.c use OPT_BOOL and refactor logic

[Junio C Hamano <gitster@pobox.com>]

Philip Oakley <philipoakley@iee.org> writes:

> Rename deprecated OPT_BOOLEAN option to OPT_BOOL in preparation for
> 'git help --guides'. The former OPT_BOOLEAN would now be OPT_COUNTUP,
> but that capability is not required.
>
> Separate out the show_all 'return(0)' and git_more_info_string logic
> ready for inclusion of show_guides.
>
> Signed-off-by: Philip Oakley <philipoakley@iee.org>
> ---

You are creating a gap in the output so that you can add some more
stuff in later patches, which is fine, but I do not think we call
that kind of change a "refactor" ;-).

The change looks fine.

>  builtin/help.c | 8 +++++++-
>  1 file changed, 7 insertions(+), 1 deletion(-)
>
> diff --git a/builtin/help.c b/builtin/help.c
> index d1d7181..8969d3b 100644
> --- a/builtin/help.c
> +++ b/builtin/help.c
> @@ -39,7 +39,7 @@ static int show_all = 0;
>  static unsigned int colopts;
>  static enum help_format help_format = HELP_FORMAT_NONE;
>  static struct option builtin_help_options[] = {
> -	OPT_BOOLEAN('a', "all", &show_all, N_("print all available commands")),
> +	OPT_BOOL('a', "all", &show_all, N_("print all available commands")),
>  	OPT_SET_INT('m', "man", &help_format, N_("show man page"), HELP_FORMAT_MAN),
>  	OPT_SET_INT('w', "web", &help_format, N_("show manual in web browser"),
>  			HELP_FORMAT_WEB),
> @@ -428,7 +428,13 @@ int cmd_help(int argc, const char **argv, const char *prefix)
>  		git_config(git_help_config, NULL);
>  		printf(_("usage: %s%s"), _(git_usage_string), "\n\n");
>  		list_commands(colopts, &main_cmds, &other_cmds);
> +	}
> +
> +	if (show_all) {
>  		printf("%s\n", _(git_more_info_string));
> +		/*
> +		* We're done. Ignore any remaining args
> +		*/
>  		return 0;
>  	}