Merge branch 'ag/sequencer-todo-updates'
Reduce unnecessary reading of state variables back from the disk during sequencer operation. * ag/sequencer-todo-updates: sequencer: directly call pick_commits() from complete_action() rebase: fill `squash_onto' in get_replay_opts() sequencer: move the code writing total_nr on the disk to a new function sequencer: update `done_nr' when skipping commands in a todo list sequencer: update `total_nr' when adding an item to a todo list
This commit is contained in:
@ -130,6 +130,12 @@ static struct replay_opts get_replay_opts(const struct rebase_options *opts)
|
||||
parse_strategy_opts(&replay, strategy_buf.buf);
|
||||
|
||||
strbuf_release(&strategy_buf);
|
||||
|
||||
if (opts->squash_onto) {
|
||||
oidcpy(&replay.squash_onto, opts->squash_onto);
|
||||
replay.have_squash_onto = 1;
|
||||
}
|
||||
|
||||
return replay;
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user