diff options
| author | Junio C Hamano <gitster@pobox.com> | 2021-10-13 22:15:58 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2021-10-13 22:15:58 (GMT) |
| commit | 62f035aee3ff53aa9c5296d5acb4c4b683ba314d (patch) | |
| tree | 8b2ff32deb4922a1468a672b68ecf2284fc09899 /parse-options.h | |
| parent | af303ee39214a04ad3c01e5924f2e8c09b5c18cb (diff) | |
| parent | 06fa4db3f7e450deb0bb849b338d7a5453f0d183 (diff) | |
| download | git-62f035aee3ff53aa9c5296d5acb4c4b683ba314d.zip git-62f035aee3ff53aa9c5296d5acb4c4b683ba314d.tar.gz git-62f035aee3ff53aa9c5296d5acb4c4b683ba314d.tar.bz2 | |
Merge branch 'ab/help-config-vars'
Teach "git help -c" into helping the command line completion of
configuration variables.
* ab/help-config-vars:
help: move column config discovery to help.c library
help / completion: make "git help" do the hard work
help tests: test --config-for-completion option & output
help: simplify by moving to OPT_CMDMODE()
help: correct logic error in combining --all and --guides
help: correct logic error in combining --all and --config
help tests: add test for --config output
help: correct usage & behavior of "git help --guides"
help: correct the usage string in -h and documentation
Diffstat (limited to 'parse-options.h')
| -rw-r--r-- | parse-options.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/parse-options.h b/parse-options.h index 39d9088..1340547 100644 --- a/parse-options.h +++ b/parse-options.h @@ -166,8 +166,10 @@ struct option { #define OPT_BOOL(s, l, v, h) OPT_BOOL_F(s, l, v, h, 0) #define OPT_HIDDEN_BOOL(s, l, v, h) { OPTION_SET_INT, (s), (l), (v), NULL, \ (h), PARSE_OPT_NOARG | PARSE_OPT_HIDDEN, NULL, 1} -#define OPT_CMDMODE(s, l, v, h, i) { OPTION_SET_INT, (s), (l), (v), NULL, \ - (h), PARSE_OPT_CMDMODE|PARSE_OPT_NOARG|PARSE_OPT_NONEG, NULL, (i) } +#define OPT_CMDMODE_F(s, l, v, h, i, f) { OPTION_SET_INT, (s), (l), (v), NULL, \ + (h), PARSE_OPT_CMDMODE|PARSE_OPT_NOARG|PARSE_OPT_NONEG | (f), NULL, (i) } +#define OPT_CMDMODE(s, l, v, h, i) OPT_CMDMODE_F(s, l, v, h, i, 0) + #define OPT_INTEGER(s, l, v, h) OPT_INTEGER_F(s, l, v, h, 0) #define OPT_MAGNITUDE(s, l, v, h) { OPTION_MAGNITUDE, (s), (l), (v), \ N_("n"), (h), PARSE_OPT_NONEG } |