]> git.ipfire.org Git - thirdparty/git.git/commit - builtin/rebase.c
rebase: fill `squash_onto' in get_replay_opts()
authorAlban Gruin <alban.gruin@gmail.com>
Sun, 24 Nov 2019 17:43:31 +0000 (18:43 +0100)
committerJunio C Hamano <gitster@pobox.com>
Mon, 25 Nov 2019 03:24:49 +0000 (12:24 +0900)
commita2dd67f10523d3593f404b9889b6318f75ab988c
tree4d4f5e3687fbb38cbd05bcc4476392e4da2954e9
parent3f34f2d8a4da82ddda48a591cbb091f24a5f3e58
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>
builtin/rebase.c