parse-options: introduce die_for_incompatible_opt2()

The functions die_for_incompatible_opt3() and
die_for_incompatible_opt4() already exist to die whenever a user
specifies three or four options respectively that are not compatible.

Introduce die_for_incompatible_opt2() which dies when two options that
are incompatible are set.

Signed-off-by: Toon Claes <toon@iotcl.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/builtin/replay.c b/builtin/replay.c
index 1afc6d1ee0cb738fa7fa3f2b5c8ce0dd7802e7da..032c172b65ece4e2c3b275ffdde22a54c55a3933 100644 (file)
--- a/builtin/replay.c
+++ b/builtin/replay.c
@@ -163,9 +163,10 @@ static void determine_replay_mode(struct rev_cmdline_info *cmd_info,
        get_ref_information(cmd_info, &rinfo);
        if (!rinfo.positive_refexprs)
                die(_("need some commits to replay"));
-       if (onto_name && *advance_name)
-               die(_("--onto and --advance are incompatible"));
-       else if (onto_name) {
+
+       die_for_incompatible_opt2(!!onto_name, "--onto",
+                                 !!*advance_name, "--advance");
+       if (onto_name) {
                *onto = peel_committish(onto_name);
                if (rinfo.positive_refexprs <
                    strset_get_size(&rinfo.positive_refs))

diff --git a/parse-options.h b/parse-options.h
index 39f088625494f20dea96b9a9cbe986916773bf60..fca944d9a93d643d984c58de2ead9154c8b16c94 100644 (file)
--- a/parse-options.h
+++ b/parse-options.h
@@ -436,6 +436,15 @@ static inline void die_for_incompatible_opt3(int opt1, const char *opt1_name,
                                  0, "");
 }
 
+static inline void die_for_incompatible_opt2(int opt1, const char *opt1_name,
+                                            int opt2, const char *opt2_name)
+{
+       die_for_incompatible_opt4(opt1, opt1_name,
+                                 opt2, opt2_name,
+                                 0, "",
+                                 0, "");
+}
+
 /*
  * Use these assertions for callbacks that expect to be called with NONEG and
  * NOARG respectively, and do not otherwise handle the "unset" and "arg"