diff options
| author | Junio C Hamano <gitster@pobox.com> | 2021-09-23 20:44:48 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2021-09-23 20:44:48 (GMT) |
| commit | 0e35107e7dde88a8d53a98773afbbbd23cd694ae (patch) | |
| tree | 87d23d4283a3e80eb79ac62e09067607eeeea17e /parse-options.h | |
| parent | 0a4cb1f1f2f64e5f3791809284ba786a8094dfb4 (diff) | |
| parent | 4c25356e0edaa92e21aadb67579a0263019fbdc4 (diff) | |
| download | git-0e35107e7dde88a8d53a98773afbbbd23cd694ae.zip git-0e35107e7dde88a8d53a98773afbbbd23cd694ae.tar.gz git-0e35107e7dde88a8d53a98773afbbbd23cd694ae.tar.bz2 | |
Merge branch 'ab/retire-option-argument'
An oddball OPTION_ARGUMENT feature has been removed from the
parse-options API.
* ab/retire-option-argument:
parse-options API: remove OPTION_ARGUMENT feature
difftool: use run_command() API in run_file_diff()
difftool: prepare "diff" cmdline in cmd_difftool()
difftool: prepare "struct child_process" in cmd_difftool()
Diffstat (limited to 'parse-options.h')
| -rw-r--r-- | parse-options.h | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/parse-options.h b/parse-options.h index a845a9d..39d9088 100644 --- a/parse-options.h +++ b/parse-options.h @@ -8,7 +8,6 @@ enum parse_opt_type { /* special types */ OPTION_END, - OPTION_ARGUMENT, OPTION_GROUP, OPTION_NUMBER, OPTION_ALIAS, @@ -155,8 +154,6 @@ struct option { #define OPT_INTEGER_F(s, l, v, h, f) { OPTION_INTEGER, (s), (l), (v), N_("n"), (h), (f) } #define OPT_END() { OPTION_END } -#define OPT_ARGUMENT(l, v, h) { OPTION_ARGUMENT, 0, (l), (v), NULL, \ - (h), PARSE_OPT_NOARG, NULL, 1 } #define OPT_GROUP(h) { OPTION_GROUP, 0, NULL, NULL, NULL, (h) } #define OPT_BIT(s, l, v, h, b) OPT_BIT_F(s, l, v, h, b, 0) #define OPT_BITOP(s, l, v, h, set, clear) { OPTION_BITOP, (s), (l), (v), NULL, (h), \ |