undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Restore use of 'help.format' configuration property in 'git help'

Browse Source 
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>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Pat Thoyts 2012-06-22 13:48:46 +01:00 committed by Junio C Hamano
parent 1cc8af044c
commit d0408c0c8c
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
builtin/help.c
View File

@ -449,10 +449,10 @@ int cmd_help(int argc, const char **argv, const char *prefix)
setup_git_directory_gently(&nongit); setup_git_directory_gently(&nongit);
git_config(git_help_config, NULL); git_config(git_help_config, NULL);
if (parsed_help_format == HELP_FORMAT_NONE) if (parsed_help_format != HELP_FORMAT_NONE)
help_format = parse_help_format(DEFAULT_HELP_FORMAT);
else
help_format = parsed_help_format; help_format = parsed_help_format;
if (help_format == HELP_FORMAT_NONE)
help_format = parse_help_format(DEFAULT_HELP_FORMAT);
alias = alias_lookup(argv[0]); alias = alias_lookup(argv[0]);
if (alias && !is_git_command(argv[0])) { if (alias && !is_git_command(argv[0])) {