diff options
Diffstat (limited to 'builtin/rebase--interactive.c')
| -rw-r--r-- | builtin/rebase--interactive.c | 22 |
1 files changed, 13 insertions, 9 deletions
diff --git a/builtin/rebase--interactive.c b/builtin/rebase--interactive.c index a2ab68ed06..888390f911 100644 --- a/builtin/rebase--interactive.c +++ b/builtin/rebase--interactive.c @@ -1,3 +1,4 @@ +#define USE_THE_INDEX_COMPATIBILITY_MACROS #include "builtin.h" #include "cache.h" #include "config.h" @@ -105,7 +106,7 @@ static int do_interactive_rebase(struct replay_opts *opts, unsigned flags, if (restrict_revision) argv_array_push(&make_script_args, restrict_revision); - ret = sequencer_make_script(todo_list, + ret = sequencer_make_script(the_repository, todo_list, make_script_args.argc, make_script_args.argv, flags); fclose(todo_list); @@ -114,7 +115,8 @@ static int do_interactive_rebase(struct replay_opts *opts, unsigned flags, error(_("could not generate todo list")); else { discard_cache(); - ret = complete_action(opts, flags, shortrevisions, onto_name, onto, + ret = complete_action(the_repository, opts, flags, + shortrevisions, onto_name, onto, head_hash, cmd, autosquash); } @@ -192,6 +194,8 @@ int cmd_rebase__interactive(int argc, const char **argv, const char *prefix) OPT_STRING(0, "onto-name", &onto_name, N_("onto-name"), N_("onto name")), OPT_STRING(0, "cmd", &cmd, N_("cmd"), N_("the command to run")), OPT_RERERE_AUTOUPDATE(&opts.allow_rerere_auto), + OPT_BOOL(0, "reschedule-failed-exec", &opts.reschedule_failed_exec, + N_("automatically re-schedule any `exec` that fails")), OPT_END() }; @@ -232,14 +236,14 @@ int cmd_rebase__interactive(int argc, const char **argv, const char *prefix) case SKIP: { struct string_list merge_rr = STRING_LIST_INIT_DUP; - rerere_clear(&merge_rr); + rerere_clear(the_repository, &merge_rr); /* fallthrough */ case CONTINUE: - ret = sequencer_continue(&opts); + ret = sequencer_continue(the_repository, &opts); 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; @@ -252,16 +256,16 @@ int cmd_rebase__interactive(int argc, const char **argv, const char *prefix) } case SHORTEN_OIDS: case EXPAND_OIDS: - ret = transform_todos(flags); + ret = transform_todos(the_repository, flags); break; case CHECK_TODO_LIST: - ret = check_todo_list(); + ret = check_todo_list(the_repository); break; case REARRANGE_SQUASH: - ret = rearrange_squash(); + ret = rearrange_squash(the_repository); break; case ADD_EXEC: - ret = sequencer_add_exec_commands(cmd); + ret = sequencer_add_exec_commands(the_repository, cmd); break; default: BUG("invalid command '%d'", command); |