help: fix configured help format taking over command line one

Since commit 7c3baa9 (help -a: do not unnecessarily look for a
repository, 2009-09-04), the help format that is passed as a
command line option is not used if an help format has been
configured. This patch fixes that.

Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/builtin-help.c b/builtin-help.c
index 09ad4b04f9fa860a32580717e61acc942de23388..3182a2bec466c50a9a1db1e91888bad3335414b1 100644 (file)
--- a/builtin-help.c
+++ b/builtin-help.c
@@ -23,13 +23,14 @@ static struct man_viewer_info_list {
 } *man_viewer_info_list;
 
 enum help_format {
 } *man_viewer_info_list;
 
 enum help_format {

+       HELP_FORMAT_NONE,

        HELP_FORMAT_MAN,
        HELP_FORMAT_INFO,
        HELP_FORMAT_WEB,
 };
 
 static int show_all = 0;
        HELP_FORMAT_MAN,
        HELP_FORMAT_INFO,
        HELP_FORMAT_WEB,
 };
 
 static int show_all = 0;

-static enum help_format help_format = HELP_FORMAT_MAN;
+static enum help_format help_format = HELP_FORMAT_NONE;

 static struct option builtin_help_options[] = {
        OPT_BOOLEAN('a', "all", &show_all, "print all available commands"),
        OPT_SET_INT('m', "man", &help_format, "show man page", HELP_FORMAT_MAN),
 static struct option builtin_help_options[] = {
        OPT_BOOLEAN('a', "all", &show_all, "print all available commands"),
        OPT_SET_INT('m', "man", &help_format, "show man page", HELP_FORMAT_MAN),


@@ -415,10 +416,12 @@ int cmd_help(int argc, const char **argv, const char *prefix)
 {
        int nongit;
        const char *alias;
 {
        int nongit;
        const char *alias;

+       enum help_format parsed_help_format;

        load_command_list("git-", &main_cmds, &other_cmds);
 
        argc = parse_options(argc, argv, prefix, builtin_help_options,
                        builtin_help_usage, 0);
        load_command_list("git-", &main_cmds, &other_cmds);
 
        argc = parse_options(argc, argv, prefix, builtin_help_options,
                        builtin_help_usage, 0);

+       parsed_help_format = help_format;

 
        if (show_all) {
                printf("usage: %s\n\n", git_usage_string);
 
        if (show_all) {
                printf("usage: %s\n\n", git_usage_string);


@@ -437,6 +440,9 @@ int cmd_help(int argc, const char **argv, const char *prefix)
        setup_git_directory_gently(&nongit);
        git_config(git_help_config, NULL);
 
        setup_git_directory_gently(&nongit);
        git_config(git_help_config, NULL);
 

+       if (parsed_help_format != HELP_FORMAT_NONE)
+               help_format = parsed_help_format;
+

        alias = alias_lookup(argv[0]);
        if (alias && !is_git_command(argv[0])) {
                printf("`git %s' is aliased to `%s'\n", argv[0], alias);
        alias = alias_lookup(argv[0]);
        if (alias && !is_git_command(argv[0])) {
                printf("`git %s' is aliased to `%s'\n", argv[0], alias);


@@ -444,6 +450,7 @@ int cmd_help(int argc, const char **argv, const char *prefix)
        }
 
        switch (help_format) {
        }
 
        switch (help_format) {

+       case HELP_FORMAT_NONE:

        case HELP_FORMAT_MAN:
                show_man_page(argv[0]);
                break;
        case HELP_FORMAT_MAN:
                show_man_page(argv[0]);
                break;