summaryrefslogtreecommitdiff
path: root/builtin/help.c
diff options
context:
space:
mode:
authorÆvar Arnfjörð Bjarmason <avarab@gmail.com>2022-02-21 19:38:49 (GMT)
committerJunio C Hamano <gitster@pobox.com>2022-02-23 21:41:37 (GMT)
commit5e8068b74df8d0c58042a3ffe1c09dbffbbc63f7 (patch)
tree6f63b8369125001a165150a8b065b533127a609c /builtin/help.c
parentd7f817d376134ec09e6804cdb6e3d062e3308eb9 (diff)
downloadgit-5e8068b74df8d0c58042a3ffe1c09dbffbbc63f7.zip
git-5e8068b74df8d0c58042a3ffe1c09dbffbbc63f7.tar.gz
git-5e8068b74df8d0c58042a3ffe1c09dbffbbc63f7.tar.bz2
help: correct usage & behavior of "git help --all"
Do the same for the "--all" option that I did for "--guides" in 9856ea6785c (help: correct usage & behavior of "git help --guides", 2021-09-22). I.e. we've documented it as ignoring non-option arguments, let's have it error out instead. As with other changes made in 62f035aee3f (Merge branch 'ab/help-config-vars', 2021-10-13) this is technically a change in behavior, but in practice it's just a bug fix. We were ignoring this before, but by erroring we can simplify our documentation and synopsis, as well as avoid user confusion as they wonder what the difference between e.g. "git help --all" and "git help --all status" is (there wasn't any difference). Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/help.c')
-rw-r--r--builtin/help.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/builtin/help.c b/builtin/help.c
index 1c1581e..b682446 100644
--- a/builtin/help.c
+++ b/builtin/help.c
@@ -75,8 +75,8 @@ static struct option builtin_help_options[] = {
};
static const char * const builtin_help_usage[] = {
- N_("git help [-a|--all] [--[no-]verbose]]\n"
- " [[-i|--info] [-m|--man] [-w|--web]] [<command>]"),
+ N_("git help [-a|--all] [--[no-]verbose]]"),
+ N_("git help [[-i|--info] [-m|--man] [-w|--web]] [<command>]"),
N_("git help [-g|--guides]"),
N_("git help [-c|--config]"),
NULL
@@ -594,6 +594,7 @@ int cmd_help(int argc, const char **argv, const char *prefix)
switch (cmd_mode) {
case HELP_ACTION_ALL:
+ opt_mode_usage(argc, "--all");
if (verbose) {
setup_pager();
list_all_cmds_help();