X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=rebase-interactive.c;h=68aff1dac28878f2f9c010459bf5f4362322bd3f;hb=e52c6bbd131f1f4f17b95e28d12ead0c81a8e890;hp=78f3263fc153079938898989822b57e5888568d6;hpb=544d114eb2ec2fbc7be123ef29492e87c760f4c3;p=thirdparty%2Fgit.git diff --git a/rebase-interactive.c b/rebase-interactive.c index 78f3263fc1..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(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(flags & ~(TODO_LIST_SHORTEN_IDS)); + transform_todos(r, flags & ~(TODO_LIST_SHORTEN_IDS)); return 0; }