* [PATCH] Restore use of 'help.format' configuration property in 'git help'
@ 2012-06-22 12:48 Pat Thoyts
2012-06-22 18:06 ` Junio C Hamano
2012-06-23 12:52 ` Vincent van Ravesteijn
0 siblings, 2 replies; 3+ messages in thread
From: Pat Thoyts @ 2012-06-22 12:48 UTC (permalink / raw)
To: git; +Cc: Junio C Hamano, Vincent van Ravesteijn
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(-)
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
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [PATCH] Restore use of 'help.format' configuration property in 'git help'
2012-06-22 12:48 [PATCH] Restore use of 'help.format' configuration property in 'git help' Pat Thoyts
@ 2012-06-22 18:06 ` Junio C Hamano
2012-06-23 12:52 ` Vincent van Ravesteijn
1 sibling, 0 replies; 3+ messages in thread
From: Junio C Hamano @ 2012-06-22 18:06 UTC (permalink / raw)
To: Pat Thoyts; +Cc: git, Vincent van Ravesteijn
Pat Thoyts <patthoyts@users.sourceforge.net> 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 <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])) {
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [PATCH] Restore use of 'help.format' configuration property in 'git help'
2012-06-22 12:48 [PATCH] Restore use of 'help.format' configuration property in 'git help' Pat Thoyts
2012-06-22 18:06 ` Junio C Hamano
@ 2012-06-23 12:52 ` Vincent van Ravesteijn
1 sibling, 0 replies; 3+ messages in thread
From: Vincent van Ravesteijn @ 2012-06-23 12:52 UTC (permalink / raw)
To: Pat Thoyts; +Cc: git, Junio C Hamano
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
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2012-06-23 12:53 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-06-22 12:48 [PATCH] Restore use of 'help.format' configuration property in 'git help' Pat Thoyts
2012-06-22 18:06 ` Junio C Hamano
2012-06-23 12:52 ` Vincent van Ravesteijn
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).