diff options
| author | Phillip Wood <phillip.wood@dunelm.org.uk> | 2023-04-10 10:08:29 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2023-04-10 09:53:19 -0700 |
| commit | 4a8bc9860aa09942dd0e6540d53102219a7e920d (patch) | |
| tree | 98ad5eed7df31536638880e7088d1c5381a60d98 /sequencer.c | |
| parent | fb60b9f37f87241a886e183f0ec6261debb9c1c5 (diff) | |
| download | git-4a8bc9860aa09942dd0e6540d53102219a7e920d.tar.gz | |
rebase -m: cleanup --strategy-option handling
When handling "--strategy-option" rebase collects the commands into a
struct string_list, then concatenates them into a string, prepending "--"
to each one before splitting the string and removing the "--" prefix.
This is an artifact of the scripted rebase and the need to support
"rebase --preserve-merges". Now that "--preserve-merges" no-longer
exists we can cleanup the way the argument is handled.
The tests for a bad strategy option are adjusted now that
parse_strategy_opts() is no-longer called when starting a rebase. The
fact that it only errors out when running "git rebase --continue" is a
mixed blessing but the next commit will fix the root cause of the
parsing problem so lets not worry about that here.
Reviewed-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'sequencer.c')
| -rw-r--r-- | sequencer.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sequencer.c b/sequencer.c index 50d469812a..587a473d6e 100644 --- a/sequencer.c +++ b/sequencer.c @@ -2913,7 +2913,7 @@ static int populate_opts_cb(const char *key, const char *value, void *data) return 0; } -void parse_strategy_opts(struct replay_opts *opts, char *raw_opts) +static void parse_strategy_opts(struct replay_opts *opts, char *raw_opts) { int i; int count; |