mirror of
https://github.com/git/git
synced 2024-10-01 06:05:20 +00:00
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>
This commit is contained in:
parent
3cbace5ee0
commit
7b91d310ce
|
@ -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 rename-section [<file-option>] <old-name> <new-name>"),
|
||||||
N_("git config remove-section [<file-option>] <name>"),
|
N_("git config remove-section [<file-option>] <name>"),
|
||||||
N_("git config edit [<file-option>]"),
|
N_("git config edit [<file-option>]"),
|
||||||
|
N_("git config [<file-option>] --get-colorbool <name> [<stdout-is-tty>]"),
|
||||||
NULL
|
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.
|
* us when parsing the legacy-style modes that don't use subcommands.
|
||||||
*/
|
*/
|
||||||
argc = parse_options(argc, argv, prefix, builtin_subcommand_options, builtin_config_usage,
|
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) {
|
if (subcommand) {
|
||||||
argc = parse_options(argc, argv, prefix, builtin_subcommand_options, builtin_config_usage,
|
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);
|
return subcommand(argc, argv, prefix);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -10,7 +10,6 @@ checkout
|
||||||
checkout-index
|
checkout-index
|
||||||
clone
|
clone
|
||||||
column
|
column
|
||||||
config
|
|
||||||
credential
|
credential
|
||||||
credential-cache
|
credential-cache
|
||||||
credential-store
|
credential-store
|
||||||
|
|
Loading…
Reference in a new issue