# [PATCH] Restore use of 'help.format' configuration property in 'git help' 3 messages from 2012-06-22 to 2012-06-23. Participants: Pat Thoyts, Junio C Hamano, Vincent van Ravesteijn. Thread: https://gitlist.dev/t/30868 ## Pat Thoyts, 2012-06-22 12:48 Subject: [PATCH] Restore use of 'help.format' configuration property in 'git help' Message-ID: <1340369326-1840-1-git-send-email-patthoyts@users.sourceforge.net> URL: https://gitlist.dev/e/1340369326-1840-1-git-send-email-patthoyts%40users.sourceforge.net ``` 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 --- 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])) { -- 1.7.11.msysgit.0 ``` ## Junio C Hamano, 2012-06-22 18:06 Subject: Re: [PATCH] Restore use of 'help.format' configuration property in 'git help' Message-ID: <7vy5nfp6fu.fsf@alter.siamese.dyndns.org> URL: https://gitlist.dev/e/7vy5nfp6fu.fsf%40alter.siamese.dyndns.org In-Reply-To: <1340369326-1840-1-git-send-email-patthoyts@users.sourceforge.net> ``` Pat Thoyts 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. > > Signed-off-by: Pat Thoyts > --- > 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, 2012-06-23 12:52 Subject: Re: [PATCH] Restore use of 'help.format' configuration property in 'git help' Message-ID: <4FE5BC02.4000600@lyx.org> URL: https://gitlist.dev/e/4FE5BC02.4000600%40lyx.org In-Reply-To: <1340369326-1840-1-git-send-email-patthoyts@users.sourceforge.net> ``` Op 22-6-2012 14:48, Pat Thoyts schreef: > 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 ```