Re: [PATCH] Restore use of 'help.format' configuration property in 'git help'
From: Junio C Hamano <hidden>
Date: 2016-06-15 22:54:09
Pat Thoyts [off-list ref] writes:
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.
quoted hunk
Signed-off-by: Pat Thoyts <redacted> --- 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])) {