diff options
author | Alban Gruin <alban.gruin@gmail.com> | 2019-03-05 22:17:55 +0300 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2019-03-07 03:17:57 +0300 |
commit | f2a04904be6584f1ec783ed5d3c425026bcf908f (patch) | |
tree | d748ccafea452c7085dd686d1d3a8da0f5341c1c /builtin/rebase--interactive.c | |
parent | 683153a438f1b6b8e1a289a71f36244bde67e38f (diff) |
sequencer: refactor rearrange_squash() to work on a todo_list
This refactors rearrange_squash() to work on a todo_list to avoid
redundant reads and writes. The function is renamed
todo_list_rearrange_squash().
The old version created a new buffer, which was directly written to the
disk. This new version creates a new item list by just copying items
from the old item list, without creating a new buffer. This eliminates
the need to reparse the todo list, but this also means its buffer cannot
be directly written to the disk.
As rebase -p still need to check the todo list from the disk, a new
function is introduced, rearrange_squash_in_todo_file().
complete_action() still uses rearrange_squash_in_todo_file() for now.
This will be changed in a future commit.
Signed-off-by: Alban Gruin <alban.gruin@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/rebase--interactive.c')
-rw-r--r-- | builtin/rebase--interactive.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/rebase--interactive.c b/builtin/rebase--interactive.c index 813bc34140..60b15f9693 100644 --- a/builtin/rebase--interactive.c +++ b/builtin/rebase--interactive.c @@ -268,7 +268,7 @@ int cmd_rebase__interactive(int argc, const char **argv, const char *prefix) ret = check_todo_list_from_file(the_repository); break; case REARRANGE_SQUASH: - ret = rearrange_squash(the_repository); + ret = rearrange_squash_in_todo_file(the_repository); break; case ADD_EXEC: ret = sequencer_add_exec_commands(the_repository, &commands); |