rebase: fill `squash_onto' in get_replay_opts()
When sequencer_continue() is called by complete_action(), `opts' has been filled by get_replay_opts(). Currently, it does not initialise the `squash_onto' field (used by the `--root' mode), only read_populate_opts() does. It’s not a problem yet since sequencer_continue() calls it before pick_commits(), but it would lead to incorrect results once complete_action() is modified to call pick_commits() directly. Let’s change that. Signed-off-by: Alban Gruin <alban.gruin@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Alban Gruin committed
Nov 24, 2019 at 18:43 UTC
a2dd67f10523d3593f404b9889b6318f75ab988c
1 file changed
+5
builtin/rebase.c
+5
@@ -117,6 +117,11 @@ static struct replay_opts get_replay_opts(const struct rebase_options *opts)
117
if (opts->strategy_opts)
118
parse_strategy_opts(&replay, opts->strategy_opts);
119
120
+ if (opts->squash_onto) {
121
+ oidcpy(&replay.squash_onto, opts->squash_onto);
122
+ replay.have_squash_onto = 1;
123
+ }
124
+
125
return replay;
126
}
127