Skip to content

Commit 06aa5e4

Browse files
dschogitster
authored andcommitted
rebase: remove a no-longer-used function
With the `--preserve-merges` option going away, we no longer need this function. Helped-by: Alban Gruin <[email protected]> Signed-off-by: Johannes Schindelin <[email protected]> Reviewed-by: Ævar Arnfjörð Bjarmason <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 82db1f8 commit 06aa5e4

File tree

2 files changed

+0
-31
lines changed

2 files changed

+0
-31
lines changed

rebase-interactive.c

Lines changed: 0 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -226,32 +226,3 @@ int todo_list_check_against_backup(struct repository *r, struct todo_list *todo_
226226
todo_list_release(&backup);
227227
return res;
228228
}
229-
230-
int check_todo_list_from_file(struct repository *r)
231-
{
232-
struct todo_list old_todo = TODO_LIST_INIT, new_todo = TODO_LIST_INIT;
233-
int res = 0;
234-
235-
if (strbuf_read_file(&new_todo.buf, rebase_path_todo(), 0) < 0) {
236-
res = error(_("could not read '%s'."), rebase_path_todo());
237-
goto out;
238-
}
239-
240-
if (strbuf_read_file(&old_todo.buf, rebase_path_todo_backup(), 0) < 0) {
241-
res = error(_("could not read '%s'."), rebase_path_todo_backup());
242-
goto out;
243-
}
244-
245-
res = todo_list_parse_insn_buffer(r, old_todo.buf.buf, &old_todo);
246-
if (!res)
247-
res = todo_list_parse_insn_buffer(r, new_todo.buf.buf, &new_todo);
248-
if (res)
249-
fprintf(stderr, _(edit_todo_list_advice));
250-
if (!res)
251-
res = todo_list_check(&old_todo, &new_todo);
252-
out:
253-
todo_list_release(&old_todo);
254-
todo_list_release(&new_todo);
255-
256-
return res;
257-
}

rebase-interactive.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,4 @@ int todo_list_check(struct todo_list *old_todo, struct todo_list *new_todo);
1616
int todo_list_check_against_backup(struct repository *r,
1717
struct todo_list *todo_list);
1818

19-
int check_todo_list_from_file(struct repository *r);
20-
2119
#endif

0 commit comments

Comments
 (0)