diff options
| author | Junio C Hamano <gitster@pobox.com> | 2023-04-18 04:05:13 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2023-04-18 04:05:13 +0300 |
| commit | 3c957e6d399452897209d90fc0528a77bb093df3 (patch) | |
| tree | 9db9f2a1e962349bf90b350bf2d5244185fcfcb3 /parse-options.h | |
| parent | 66bf8f19439556da7cf1c8852d07b87257f2a7d9 (diff) | |
| parent | 05106aa198cd0f8a5643556ac9f8a1dfdbdb5bdd (diff) | |
Merge branch 'pw/rebase-cleanup-merge-strategy-option-handling'
Clean-up of the code path that deals with merge strategy option
handling in "git rebase".
* pw/rebase-cleanup-merge-strategy-option-handling:
rebase: remove a couple of redundant strategy tests
rebase -m: fix serialization of strategy options
rebase -m: cleanup --strategy-option handling
sequencer: use struct strvec to store merge strategy options
rebase: stop reading and writing unnecessary strategy state
Diffstat (limited to 'parse-options.h')
| -rw-r--r-- | parse-options.h | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/parse-options.h b/parse-options.h index 6f6462fdf9..8e48efe524 100644 --- a/parse-options.h +++ b/parse-options.h @@ -287,6 +287,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), \ @@ -480,6 +489,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); int parse_opt_passthru(const struct option *, const char *, int); int parse_opt_passthru_argv(const struct option *, const char *, int); |