git-p4: don't groom exclude path list on every commit

diff --git a/rebase-interactive.c b/rebase-interactive.c
index 4a9a10eff4a5a256540f45a123e170e178bc9ac4..68aff1dac28878f2f9c010459bf5f4362322bd3f 100644 (file)
--- a/rebase-interactive.c
+++ b/rebase-interactive.c
@@ -14,6 +14,7 @@ void append_todo_help(unsigned edit_todo, unsigned keep_empty,
 "s, squash <commit> = use commit, but meld into previous commit\n"
 "f, fixup <commit> = like \"squash\", but discard this commit's log message\n"
 "x, exec <command> = run command (the rest of the line) using shell\n"
+"b, break = stop here (continue rebase later with 'git rebase --continue')\n"
 "d, drop <commit> = remove commit\n"
 "l, label <label> = label current HEAD with a name\n"
 "t, reset <label> = reset HEAD to a label\n"
@@ -52,29 +53,7 @@ void append_todo_help(unsigned edit_todo, unsigned keep_empty,
        }
 }
 
-int append_todo_help_to_file(unsigned edit_todo, unsigned keep_empty)
-{
-       struct strbuf buf = STRBUF_INIT;
-       FILE *todo;
-       int ret;
-
-       todo = fopen_or_warn(rebase_path_todo(), "a");
-       if (!todo)
-               return -1;
-
-       append_todo_help(edit_todo, keep_empty, &buf);
-
-       ret = fputs(buf.buf, todo);
-       if (ret < 0)
-               error_errno(_("could not append help text to '%s'"), rebase_path_todo());
-
-       fclose(todo);
-       strbuf_release(&buf);
-
-       return ret;
-}
-
-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();
@@ -90,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);
@@ -106,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;
 }