threads / patch / 30868

patchRestore use of 'help.format' configuration property in 'git help'

Subject: [PATCH] Restore use of 'help.format' configuration property in 'git help'

## tl;dr

3 messages between Jun 22, 2012 and Jun 23, 2012. Diffs are folded; open one to read it.

replies: 2people: 3as markdown or json

Pat Thoyts· Jun 22, 2012, 12:48 UTC · lore

Commit 1cc8af0 "help: use HTML as the default help format on Windows" lost the ability to make use of the help.format config value by forcing the use of a compiled in default if no command-line argument was provided. This commit restores the use of the help.format value if one is available, overriding the compiled default.

Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net>
---
 builtin/help.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Show changes to builtin/help.c +3 −3

diff --git a/builtin/help.c b/builtin/help.c
index 536d4fd..8f9cd60 100644
--- a/builtin/help.c
+++ b/builtin/help.c
@@ -449,10 +449,10 @@ int cmd_help(int argc, const char **argv, const char *prefix)
 	setup_git_directory_gently(&nongit);
 	git_config(git_help_config, NULL);
 
-	if (parsed_help_format == HELP_FORMAT_NONE)
-		help_format = parse_help_format(DEFAULT_HELP_FORMAT);
-	else
+	if (parsed_help_format != HELP_FORMAT_NONE)
 		help_format = parsed_help_format;
+	if (help_format == HELP_FORMAT_NONE)
+		help_format = parse_help_format(DEFAULT_HELP_FORMAT);
 
 	alias = alias_lookup(argv[0]);
 	if (alias && !is_git_command(argv[0])) {

-- 
1.7.11.msysgit.0

Junio C Hamano· Jun 22, 2012, 18:06 UTC · re: Pat Thoyts · lore

Re: [PATCH] Restore use of 'help.format' configuration property in 'git help'

Pat Thoyts <patthoyts@users.sourceforge.net> writes:

Show 5 quoted lines

> Commit 1cc8af0 "help: use HTML as the default help format on Windows"
> lost the ability to make use of the help.format config value by forcing
> the use of a compiled in default if no command-line argument was provided.
> This commit restores the use of the help.format value if one is
> available, overriding the compiled default.

Of course.  Sorry for not catching it earlier.

Show 24 quoted lines

>
> Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net>
> ---
>  builtin/help.c | 6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/builtin/help.c b/builtin/help.c
> index 536d4fd..8f9cd60 100644
> --- a/builtin/help.c
> +++ b/builtin/help.c
> @@ -449,10 +449,10 @@ int cmd_help(int argc, const char **argv, const char *prefix)
>  	setup_git_directory_gently(&nongit);
>  	git_config(git_help_config, NULL);
>  
> -	if (parsed_help_format == HELP_FORMAT_NONE)
> -		help_format = parse_help_format(DEFAULT_HELP_FORMAT);
> -	else
> +	if (parsed_help_format != HELP_FORMAT_NONE)
>  		help_format = parsed_help_format;
> +	if (help_format == HELP_FORMAT_NONE)
> +		help_format = parse_help_format(DEFAULT_HELP_FORMAT);
>  
>  	alias = alias_lookup(argv[0]);
>  	if (alias && !is_git_command(argv[0])) {

Vincent van Ravesteijn· Jun 23, 2012, 12:52 UTC · re: Pat Thoyts · lore

Re: [PATCH] Restore use of 'help.format' configuration property in 'git help'

Op 22-6-2012 14:48, Pat Thoyts schreef:

Show 7 quoted lines

> Commit 1cc8af0 "help: use HTML as the default help format on Windows"
> lost the ability to make use of the help.format config value by forcing
> the use of a compiled in default if no command-line argument was provided.
> This commit restores the use of the help.format value if one is
> available, overriding the compiled default.
>
>

Thanks.

Vincent