diff options
author | Junio C Hamano <gitster@pobox.com> | 2019-12-16 13:08:31 -0800 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2019-12-16 13:08:31 -0800 |
commit | 37c2619d91aa63d4c7c07b6f8de5ff2e1c2472b2 (patch) | |
tree | 858b4acd16eb8e27bd0fdd317a661aca5a051810 /builtin | |
parent | fix-typo: consecutive-word duplications (diff) | |
parent | sequencer: directly call pick_commits() from complete_action() (diff) | |
download | tgif-37c2619d91aa63d4c7c07b6f8de5ff2e1c2472b2.tar.xz |
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
Diffstat (limited to 'builtin')
-rw-r--r-- | builtin/rebase.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/builtin/rebase.c b/builtin/rebase.c index a11e15b86f..f82fe10878 100644 --- a/builtin/rebase.c +++ b/builtin/rebase.c @@ -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; } |