From 36e7ed69de2c07a0214e79bde45714b92ac30ff2 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Nguy=E1=BB=85n=20Th=C3=A1i=20Ng=E1=BB=8Dc=20Duy?= Date: Sat, 10 Nov 2018 06:49:10 +0100 Subject: [PATCH] rebase-interactive.c: remove the_repository references MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit While at there add a forward declaration for struct strbuf. Signed-off-by: Nguyễn Thái Ngọc Duy Signed-off-by: Junio C Hamano --- builtin/rebase--interactive.c | 2 +- rebase-interactive.c | 6 +++--- rebase-interactive.h | 5 ++++- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/builtin/rebase--interactive.c b/builtin/rebase--interactive.c index bd7d39e2af..dd2a55ab1d 100644 --- a/builtin/rebase--interactive.c +++ b/builtin/rebase--interactive.c @@ -240,7 +240,7 @@ int cmd_rebase__interactive(int argc, const char **argv, const char *prefix) break; } case EDIT_TODO: - ret = edit_todo_list(flags); + ret = edit_todo_list(the_repository, flags); break; case SHOW_CURRENT_PATCH: { struct child_process cmd = CHILD_PROCESS_INIT; diff --git a/rebase-interactive.c b/rebase-interactive.c index 3cc19283ff..68aff1dac2 100644 --- a/rebase-interactive.c +++ b/rebase-interactive.c @@ -53,7 +53,7 @@ void append_todo_help(unsigned edit_todo, unsigned keep_empty, } } -int edit_todo_list(unsigned flags) +int edit_todo_list(struct repository *r, unsigned flags) { struct strbuf buf = STRBUF_INIT; const char *todo_file = rebase_path_todo(); @@ -69,7 +69,7 @@ int edit_todo_list(unsigned flags) strbuf_release(&buf); - transform_todos(the_repository, flags | TODO_LIST_SHORTEN_IDS); + transform_todos(r, flags | TODO_LIST_SHORTEN_IDS); if (strbuf_read_file(&buf, todo_file, 0) < 0) return error_errno(_("could not read '%s'."), todo_file); @@ -85,7 +85,7 @@ int edit_todo_list(unsigned flags) if (launch_sequence_editor(todo_file, NULL, NULL)) return -1; - transform_todos(the_repository, flags & ~(TODO_LIST_SHORTEN_IDS)); + transform_todos(r, flags & ~(TODO_LIST_SHORTEN_IDS)); return 0; } diff --git a/rebase-interactive.h b/rebase-interactive.h index 971da03776..17b6c9f6d0 100644 --- a/rebase-interactive.h +++ b/rebase-interactive.h @@ -1,8 +1,11 @@ #ifndef REBASE_INTERACTIVE_H #define REBASE_INTERACTIVE_H +struct strbuf; +struct repository; + void append_todo_help(unsigned edit_todo, unsigned keep_empty, struct strbuf *buf); -int edit_todo_list(unsigned flags); +int edit_todo_list(struct repository *r, unsigned flags); #endif -- 2.39.2