{"thread":{"id":"30868","subject":"[PATCH] Restore use of 'help.format' configuration property in 'git help'","startedAt":"2012-06-22T12:48:46Z","lastAt":"2012-06-23T12:52:19Z","messageCount":3,"participants":["Pat Thoyts","Junio C Hamano","Vincent van Ravesteijn"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"194069","messageId":"1340369326-1840-1-git-send-email-patthoyts@users.sourceforge.net","threadId":"30868","inReplyTo":null,"subject":"[PATCH] Restore use of 'help.format' configuration property in 'git help'","fromName":"Pat Thoyts","fromEmail":"patthoyts@users.sourceforge.net","sentAt":"2012-06-22T12:48:46Z","receivedAt":"2012-06-22T12:48:46Z","isPatch":true,"sender":{"key":"patthoyts@users.sourceforge.net","avatar":"https://avatars.githubusercontent.com/u/30739?v=4"},"body":"Commit 1cc8af0 \"help: use HTML as the default help format on Windows\"\nlost the ability to make use of the help.format config value by forcing\nthe use of a compiled in default if no command-line argument was provided.\nThis commit restores the use of the help.format value if one is\navailable, overriding the compiled default.\n\nSigned-off-by: Pat Thoyts <patthoyts@users.sourceforge.net>\n---\n builtin/help.c | 6 +++---\n 1 file changed, 3 insertions(+), 3 deletions(-)\n\ndiff --git a/builtin/help.c b/builtin/help.c\nindex 536d4fd..8f9cd60 100644\n--- a/builtin/help.c\n+++ b/builtin/help.c\n@@ -449,10 +449,10 @@ int cmd_help(int argc, const char **argv, const char *prefix)\n \tsetup_git_directory_gently(&nongit);\n \tgit_config(git_help_config, NULL);\n \n-\tif (parsed_help_format == HELP_FORMAT_NONE)\n-\t\thelp_format = parse_help_format(DEFAULT_HELP_FORMAT);\n-\telse\n+\tif (parsed_help_format != HELP_FORMAT_NONE)\n \t\thelp_format = parsed_help_format;\n+\tif (help_format == HELP_FORMAT_NONE)\n+\t\thelp_format = parse_help_format(DEFAULT_HELP_FORMAT);\n \n \talias = alias_lookup(argv[0]);\n \tif (alias && !is_git_command(argv[0])) {\n-- \n1.7.11.msysgit.0\n"},{"id":"194086","messageId":"7vy5nfp6fu.fsf@alter.siamese.dyndns.org","threadId":"30868","inReplyTo":"1340369326-1840-1-git-send-email-patthoyts@users.sourceforge.net","subject":"Re: [PATCH] Restore use of 'help.format' configuration property in 'git help'","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2012-06-22T18:06:29Z","receivedAt":"2012-06-22T18:06:29Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Pat Thoyts <patthoyts@users.sourceforge.net> writes:\n\n> Commit 1cc8af0 \"help: use HTML as the default help format on Windows\"\n> lost the ability to make use of the help.format config value by forcing\n> the use of a compiled in default if no command-line argument was provided.\n> This commit restores the use of the help.format value if one is\n> available, overriding the compiled default.\n\nOf course.  Sorry for not catching it earlier.\n\n>\n> Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net>\n> ---\n>  builtin/help.c | 6 +++---\n>  1 file changed, 3 insertions(+), 3 deletions(-)\n>\n> diff --git a/builtin/help.c b/builtin/help.c\n> index 536d4fd..8f9cd60 100644\n> --- a/builtin/help.c\n> +++ b/builtin/help.c\n> @@ -449,10 +449,10 @@ int cmd_help(int argc, const char **argv, const char *prefix)\n>  \tsetup_git_directory_gently(&nongit);\n>  \tgit_config(git_help_config, NULL);\n>  \n> -\tif (parsed_help_format == HELP_FORMAT_NONE)\n> -\t\thelp_format = parse_help_format(DEFAULT_HELP_FORMAT);\n> -\telse\n> +\tif (parsed_help_format != HELP_FORMAT_NONE)\n>  \t\thelp_format = parsed_help_format;\n> +\tif (help_format == HELP_FORMAT_NONE)\n> +\t\thelp_format = parse_help_format(DEFAULT_HELP_FORMAT);\n>  \n>  \talias = alias_lookup(argv[0]);\n>  \tif (alias && !is_git_command(argv[0])) {\n"},{"id":"194131","messageId":"4FE5BC02.4000600@lyx.org","threadId":"30868","inReplyTo":"1340369326-1840-1-git-send-email-patthoyts@users.sourceforge.net","subject":"Re: [PATCH] Restore use of 'help.format' configuration property in 'git help'","fromName":"Vincent van Ravesteijn","fromEmail":"vfr@lyx.org","sentAt":"2012-06-23T12:52:19Z","receivedAt":"2012-06-23T12:52:19Z","isPatch":true,"sender":{"key":"vfr@lyx.org","avatar":"https://avatars.githubusercontent.com/u/687868?v=4"},"body":"Op 22-6-2012 14:48, Pat Thoyts schreef:\n> Commit 1cc8af0 \"help: use HTML as the default help format on Windows\"\n> lost the ability to make use of the help.format config value by forcing\n> the use of a compiled in default if no command-line argument was provided.\n> This commit restores the use of the help.format value if one is\n> available, overriding the compiled default.\n>\n>\n\nThanks.\n\nVincent\n"}]}