Merge branch 'gc/branch-recurse-submodules-fix'

[thirdparty/git.git] / parse-options.h

diff --git a/parse-options.h b/parse-options.h
index 659a4c28b2d2afa515a1efb0a75843b538fad498..685fccac137fc23884f0e816d53b7be549506441 100644 (file)
--- a/parse-options.h
+++ b/parse-options.h
@@ -240,6 +240,22 @@ void NORETURN usage_msg_optf(const char *fmt,
                             const char * const *usagestr,
                             const struct option *options, ...);
 
+void die_for_incompatible_opt4(int opt1, const char *opt1_name,
+                              int opt2, const char *opt2_name,
+                              int opt3, const char *opt3_name,
+                              int opt4, const char *opt4_name);
+
+
+static inline void die_for_incompatible_opt3(int opt1, const char *opt1_name,
+                                            int opt2, const char *opt2_name,
+                                            int opt3, const char *opt3_name)
+{
+       die_for_incompatible_opt4(opt1, opt1_name,
+                                 opt2, opt2_name,
+                                 opt3, opt3_name,
+                                 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"