Hi Alban
On 25/09/2019 21:13, Alban Gruin wrote:
get_replay_opts() did not fill `squash_onto' if possible, meaning that
I'm not sure what you mean by 'if possible' here, I think the sentance
makes sense without that.
this field should be read from the disk by the sequencer through
read_populate_opts(). Without this, calling `pick_commits()' directly
will result in incorrect results with `rebase --root'.
Let’s change that.
Good catch
Best Wishes
Phillip
Signed-off-by: Alban Gruin <alban.gruin@xxxxxxxxx>
---
builtin/rebase.c | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/builtin/rebase.c b/builtin/rebase.c
index e8319d5946..2097d41edc 100644
--- a/builtin/rebase.c
+++ b/builtin/rebase.c
@@ -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;
}
