diff mbox series

[v3,10/11] rebase: remove a no-longer-used function

Message ID 5bb04ea3f6c02c611e197d966919de351981a25a.1631048713.git.gitgitgadget@gmail.com (mailing list archive)
State Accepted
Commit 06aa5e4ea4f2c5bbf5ae80f31b0dbd5df267ba74
Headers show
Series Drop support for git rebase --preserve-merges | expand

Commit Message

Johannes Schindelin Sept. 7, 2021, 9:05 p.m. UTC 
From: Johannes Schindelin <johannes.schindelin@gmx.de>

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>
---
 rebase-interactive.c | 29 -----------------------------
 rebase-interactive.h |  2 --
 2 files changed, 31 deletions(-)
diff mbox series

Patch

diff --git a/rebase-interactive.c b/rebase-interactive.c
index b6cbd16a17f..87649d0c016 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;
-}
diff --git a/rebase-interactive.h b/rebase-interactive.h
index dc2cf0ee122..7239c60f791 100644
--- a/rebase-interactive.h
+++ b/rebase-interactive.h
@@ -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,
 				   struct todo_list *todo_list);
 
-int check_todo_list_from_file(struct repository *r);
-
 #endif