sequencer: use struct strvec to store merge strategy options

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

diff --git a/parse-options.h b/parse-options.h
index 26f19384e50ff6fcb7cbae915fa69468afa93faf..2d1d4d052ffe105b8795f57d88d16239dd2f13c5 100644 (file)
--- a/parse-options.h
+++ b/parse-options.h
@@ -285,6 +285,15 @@ struct option {
        .help = (h), \
        .callback = &parse_opt_string_list, \
 }
+#define OPT_STRVEC(s, l, v, a, h) { \
+       .type = OPTION_CALLBACK, \
+       .short_name = (s), \
+       .long_name = (l), \
+       .value = (v), \
+       .argh = (a), \
+       .help = (h), \
+       .callback = &parse_opt_strvec, \
+}
 #define OPT_UYN(s, l, v, h) { \
        .type = OPTION_CALLBACK, \
        .short_name = (s), \
@@ -478,6 +487,7 @@ int parse_opt_commits(const struct option *, const char *, int);
 int parse_opt_commit(const struct option *, const char *, int);
 int parse_opt_tertiary(const struct option *, const char *, int);
 int parse_opt_string_list(const struct option *, const char *, int);
+int parse_opt_strvec(const struct option *, const char *, int);
 int parse_opt_noop_cb(const struct option *, const char *, int);
 enum parse_opt_result parse_opt_unknown_cb(struct parse_opt_ctx_t *ctx,
                                           const struct option *,