diff options
| author |  Alban Gruin <alban.gruin@gmail.com> | 2020-01-28 22:12:45 +0100 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2020-01-28 14:13:41 -0800 |
| commit | 1da5874c1b283862f8252a2f5f2f8d4afe86346a (patch) | |
| tree | f90ec8e3e57d103a9b94f16dc3eb80c9339625a0 /sequencer.c | |
| parent | rebase -i: also avoid SHA-1 collisions with missingCommitsCheck (diff) | |
| download | tgif-1da5874c1b283862f8252a2f5f2f8d4afe86346a.tar.xz | |
sequencer: move check_todo_list_from_file() to rebase-interactive.c
The message contained in `edit_todo_list_advice' (sequencer.c) is
printed after the initial edit of the todo list if it can't be parsed or
if commits were dropped. This is done either in complete_action() for
`rebase -i', or in check_todo_list_from_file() for `rebase -p'.
Since we want to add this check when editing the list, we also want to
use this message from edit_todo_list() (rebase-interactive.c). To this
end, check_todo_list_from_file() is moved to rebase-interactive.c, and
`edit_todo_list_advice' is copied there. In the next commit,
complete_action() will stop using it, and `edit_todo_list_advice' will
be removed from sequencer.c.
Signed-off-by: Alban Gruin <alban.gruin@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'sequencer.c')
| -rw-r--r-- | sequencer.c | 29 |
1 files changed, 0 insertions, 29 deletions
diff --git a/sequencer.c b/sequencer.c index 5f69b47e32..9365fc3e5a 100644 --- a/sequencer.c +++ b/sequencer.c @@ -4991,35 +4991,6 @@ N_("You can fix this with 'git rebase --edit-todo' " "Or you can abort the rebase with 'git rebase" " --abort'.\n"); -int check_todo_list_from_file(struct repository *r) -{ - struct todo_list old_todo = TODO_LIST_INIT, new_todo = TODO_LIST_INIT; - int res = 0; - - if (strbuf_read_file_or_whine(&new_todo.buf, rebase_path_todo()) < 0) { - res = -1; - goto out; - } - - if (strbuf_read_file_or_whine(&old_todo.buf, rebase_path_todo_backup()) < 0) { - res = -1; - goto out; - } - - res = todo_list_parse_insn_buffer(r, old_todo.buf.buf, &old_todo); - if (!res) - res = todo_list_parse_insn_buffer(r, new_todo.buf.buf, &new_todo); - if (!res) - res = todo_list_check(&old_todo, &new_todo); - if (res) - fprintf(stderr, _(edit_todo_list_advice)); -out: - todo_list_release(&old_todo); - todo_list_release(&new_todo); - - return res; -} - /* skip picking commits whose parents are unchanged */ static int skip_unnecessary_picks(struct repository *r, struct todo_list *todo_list, |