diff options
| author | Johannes Schindelin <johannes.schindelin@gmx.de> | 2021-09-07 21:05:11 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2021-09-08 04:45:33 (GMT) |
| commit | 06aa5e4ea4f2c5bbf5ae80f31b0dbd5df267ba74 (patch) | |
| tree | 58cea3b66e0e786a5dcbea96d6d3c31aa869c1d3 /rebase-interactive.c | |
| parent | 82db1f8439bbde725a4dddb43f4e7c1cbe532a13 (diff) | |
| download | git-06aa5e4ea4f2c5bbf5ae80f31b0dbd5df267ba74.zip git-06aa5e4ea4f2c5bbf5ae80f31b0dbd5df267ba74.tar.gz git-06aa5e4ea4f2c5bbf5ae80f31b0dbd5df267ba74.tar.bz2 | |
rebase: remove a no-longer-used function
With the `--preserve-merges` option going away, we no longer need this
function.
Helped-by: Alban Gruin <alban.gruin@gmail.com>
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Reviewed-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'rebase-interactive.c')
| -rw-r--r-- | rebase-interactive.c | 29 |
1 files changed, 0 insertions, 29 deletions
diff --git a/rebase-interactive.c b/rebase-interactive.c index b6cbd16..87649d0 100644 --- a/rebase-interactive.c +++ b/rebase-interactive.c @@ -226,32 +226,3 @@ int todo_list_check_against_backup(struct repository *r, struct todo_list *todo_ todo_list_release(&backup); return res; } - -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(&new_todo.buf, rebase_path_todo(), 0) < 0) { - res = error(_("could not read '%s'."), rebase_path_todo()); - goto out; - } - - if (strbuf_read_file(&old_todo.buf, rebase_path_todo_backup(), 0) < 0) { - res = error(_("could not read '%s'."), rebase_path_todo_backup()); - 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) - fprintf(stderr, _(edit_todo_list_advice)); - if (!res) - res = todo_list_check(&old_todo, &new_todo); -out: - todo_list_release(&old_todo); - todo_list_release(&new_todo); - - return res; -} |