undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

rebase: remove a no-longer-used function

Browse Source 
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>
This commit is contained in:
Johannes Schindelin 2021-09-07 21:05:11 +00:00 committed by Junio C Hamano
parent 82db1f8439
commit 06aa5e4ea4
2 changed files with 0 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
rebase-interactive.c
View File

@ -226,32 +226,3 @@ int todo_list_check_against_backup(struct repository *r, struct todo_list *todo_
todo_list_release(&backup); todo_list_release(&backup);
return res; 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;
}

2
rebase-interactive.h
View File

@ -16,6 +16,4 @@ int todo_list_check(struct todo_list *old_todo, struct todo_list *new_todo);
int todo_list_check_against_backup(struct repository *r, int todo_list_check_against_backup(struct repository *r,
struct todo_list *todo_list); struct todo_list *todo_list);
int check_todo_list_from_file(struct repository *r);
#endif #endif