From: Pat Thoyts Date: Fri, 22 Jun 2012 12:48:46 +0000 (+0100) Subject: Restore use of 'help.format' configuration property in 'git help' X-Git-Tag: v1.7.12-rc0~91^2 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=d0408c0c8cd636233f01c0bda9ad71161609297c;p=git.git Restore use of 'help.format' configuration property in 'git help' 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 Signed-off-by: Junio C Hamano --- diff --git a/builtin/help.c b/builtin/help.c index 536d4fd46..8f9cd6054 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])) {