merge-base: use OPT_CMDMODE and clarify the command line parsing
The --octopus, --independent and --is-ancestor are mutually exclusive command modes (in addition to not giving any of these options), so represent them as such using the recent OPT_CMDMODE facility available since 11588263 (parse-options: add OPT_CMDMODE(), 2013-07-30), which is in v1.8.4-82-g366b80b. --all is compatible only with plain vanilla mode and --octopus mode, and the minimum number of arguments the command takes depends on the command modes, so these are now separately checked in each command mode. Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano committed
Oct 23, 2013 at 16:10 UTC
16e57aec7f672fabe38fa0e4d39252eb9c7a1563
1 file changed
+22
-16
builtin/merge-base.c
+22
-16
@@ -90,32 +90,38 @@ int cmd_merge_base(int argc, const char **argv, const char *prefix)
90
struct commit **rev;
91
int rev_nr = 0;
92
int show_all = 0;
93
- int octopus = 0;
94
- int reduce = 0;
95
- int is_ancestor = 0;
93
+ int cmdmode = 0;
94
95
struct option options[] = {
96
OPT_BOOL('a', "all", &show_all, N_("output all common ancestors")),
99
- OPT_BOOL(0, "octopus", &octopus, N_("find ancestors for a single n-way merge")),
100
- OPT_BOOL(0, "independent", &reduce, N_("list revs not reachable from others")),
101
- OPT_BOOL(0, "is-ancestor", &is_ancestor,
102
- N_("is the first one ancestor of the other?")),
97
+ OPT_CMDMODE(0, "octopus", &cmdmode,
98
+ N_("find ancestors for a single n-way merge"), 'o'),
99
+ OPT_CMDMODE(0, "independent", &cmdmode,
100
+ N_("list revs not reachable from others"), 'r'),
101
+ OPT_CMDMODE(0, "is-ancestor", &cmdmode,
102
+ N_("is the first one ancestor of the other?"), 'a'),
103
OPT_END()
104
};
105
106
git_config(git_default_config, NULL);
107
argc = parse_options(argc, argv, prefix, options, merge_base_usage, 0);
108
- if (!octopus && !reduce && argc < 2)
109
- usage_with_options(merge_base_usage, options);
110
- if (is_ancestor && (show_all || octopus || reduce))
111
- die("--is-ancestor cannot be used with other options");
112
- if (is_ancestor)
108
+
109
+ if (cmdmode == 'a') {
110
+ if (argc < 2)
111
+ usage_with_options(merge_base_usage, options);
112
+ if (show_all)
113
+ die("--is-ancestor cannot be used with --all");
114
return handle_is_ancestor(argc, argv);
114
- if (reduce && (show_all || octopus))
115
- die("--independent cannot be used with other options");
115
+ }
116
117
- if (octopus || reduce)
118
- return handle_octopus(argc, argv, reduce, show_all);
117
+ if (cmdmode == 'r' && show_all)
118
+ die("--independent cannot be used with --all");
119
+
120
+ if (cmdmode == 'r' || cmdmode == 'o')
121
+ return handle_octopus(argc, argv, cmdmode == 'r', show_all);
122
+
123
+ if (argc < 2)
124
+ usage_with_options(merge_base_usage, options);
125
126
rev = xmalloc(argc * sizeof(*rev));
127
while (argc-- > 0)