mirror of
https://github.com/git/git
synced 2024-08-25 10:45:59 +00:00
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>
This commit is contained in:
parent
3f34f2d8a4
commit
a2dd67f105
|
@ -117,6 +117,11 @@ static struct replay_opts get_replay_opts(const struct rebase_options *opts)
|
|||
if (opts->strategy_opts)
|
||||
parse_strategy_opts(&replay, opts->strategy_opts);
|
||||
|
||||
if (opts->squash_onto) {
|
||||
oidcpy(&replay.squash_onto, opts->squash_onto);
|
||||
replay.have_squash_onto = 1;
|
||||
}
|
||||
|
||||
return replay;
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in a new issue