rebase-interactive: rewrite edit_todo_list() to handle the initial edit

diff --git a/builtin/revert.c b/builtin/revert.c
index cd9f0681954db901bf1b703f623525c02b005b48..a47b53ceaff92d4079b4ea73a61ce1552ad66b05 100644 (file)
--- a/builtin/revert.c
+++ b/builtin/revert.c
@@ -69,7 +69,8 @@ static int option_parse_m(const struct option *opt,
 
        replay->mainline = strtol(arg, &end, 10);
        if (*end || replay->mainline <= 0)
-               return opterror(opt, "expects a number greater than zero", 0);
+               return error(_("option `%s' expects a number greater than zero"),
+                            opt->long_name);
 
        return 0;
 }
@@ -195,13 +196,13 @@ static int run_sequencer(int argc, const char **argv, struct replay_opts *opts)
        if (cmd == 'q') {
                int ret = sequencer_remove_state(opts);
                if (!ret)
-                       remove_branch_state();
+                       remove_branch_state(the_repository);
                return ret;
        }
        if (cmd == 'c')
                return sequencer_continue(the_repository, opts);
        if (cmd == 'a')
-               return sequencer_rollback(opts);
+               return sequencer_rollback(the_repository, opts);
        return sequencer_pick_revisions(the_repository, opts);
 }