builtin/config: display subcommand help

Until now, `git config -h` would have printed help for the old-style
syntax. Now that all modes have proper subcommands though it is
preferable to instead display the subcommand help.

Drop the `NO_INTERNAL_HELP` flag to do so. While at it, drop the help
mismatch in t0450 and add the `--get-colorbool` option to the usage such
that git-config(1)'s synopsis and `git config -h` match.

Signed-off-by: Patrick Steinhardt <ps@pks.im>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/builtin/config.c b/builtin/config.c
index 8f7fa8f31ab1fe6bdc49b507307ba31735a3328f..80aa9d8a6606b113c65798d329105cc4ae880693 100644 (file)
--- a/builtin/config.c
+++ b/builtin/config.c
@@ -23,6 +23,7 @@ static const char *const builtin_config_usage[] = {
        N_("git config rename-section [<file-option>] <old-name> <new-name>"),
        N_("git config remove-section [<file-option>] <name>"),
        N_("git config edit [<file-option>]"),
+       N_("git config [<file-option>] --get-colorbool <name> [<stdout-is-tty>]"),
        NULL
 };
 
@@ -1093,10 +1094,10 @@ int cmd_config(int argc, const char **argv, const char *prefix)
         * us when parsing the legacy-style modes that don't use subcommands.
         */
        argc = parse_options(argc, argv, prefix, builtin_subcommand_options, builtin_config_usage,
-                            PARSE_OPT_SUBCOMMAND_OPTIONAL|PARSE_OPT_NO_INTERNAL_HELP|PARSE_OPT_KEEP_ARGV0|PARSE_OPT_KEEP_UNKNOWN_OPT);
+                            PARSE_OPT_SUBCOMMAND_OPTIONAL|PARSE_OPT_KEEP_ARGV0|PARSE_OPT_KEEP_UNKNOWN_OPT);
        if (subcommand) {
                argc = parse_options(argc, argv, prefix, builtin_subcommand_options, builtin_config_usage,
-                      PARSE_OPT_SUBCOMMAND_OPTIONAL|PARSE_OPT_NO_INTERNAL_HELP|PARSE_OPT_KEEP_UNKNOWN_OPT);
+                      PARSE_OPT_SUBCOMMAND_OPTIONAL|PARSE_OPT_KEEP_UNKNOWN_OPT);
                return subcommand(argc, argv, prefix);
        }
 

diff --git a/t/t0450/txt-help-mismatches b/t/t0450/txt-help-mismatches
index a0777acd6676a65a40aa466ea694400838664c16..28003f18c924bb88a4a5d6c7e18d15e97eb43a91 100644 (file)
--- a/t/t0450/txt-help-mismatches
+++ b/t/t0450/txt-help-mismatches
@@ -10,7 +10,6 @@ checkout
 checkout-index
 clone
 column
-config
 credential
 credential-cache
 credential-store