diff options
| author | Nguyễn Thái Ngọc Duy <pclouds@gmail.com> | 2018-11-10 08:48:56 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-11-12 08:50:05 +0300 |
| commit | f11c95805495fcb588f767ffab193f2aed328eab (patch) | |
| tree | 067ad17a503c501836dfb4cf51efcb621b58015d /builtin/rebase--interactive.c | |
| parent | 6c6d5d0776b5eb60dc206691fc1fde755e94da20 (diff) | |
sequencer.c: remove implicit dependency on the_index
Since we're going to pass 'struct repository *' around most of the
time instead of 'struct index_state *' because most sequencer.c
operations need more than just the index, the_repository is replaced
as well in the functions that now take 'struct repository
*'. the_repository is still present in this file, but total clean up
will be done later. It's not the main focus of this patch.
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/rebase--interactive.c')
| -rw-r--r-- | builtin/rebase--interactive.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/builtin/rebase--interactive.c b/builtin/rebase--interactive.c index a2ab68ed06..b7ce48a1ec 100644 --- a/builtin/rebase--interactive.c +++ b/builtin/rebase--interactive.c @@ -105,7 +105,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); @@ -235,7 +235,7 @@ int cmd_rebase__interactive(int argc, const char **argv, const char *prefix) rerere_clear(&merge_rr); /* fallthrough */ case CONTINUE: - ret = sequencer_continue(&opts); + ret = sequencer_continue(the_repository, &opts); break; } case EDIT_TODO: |