diff options
Diffstat (limited to 'builtin')
| -rw-r--r-- | builtin/commit.c | 3 | ||||
| -rw-r--r-- | builtin/merge.c | 2 | ||||
| -rw-r--r-- | builtin/rebase--interactive.c | 4 | ||||
| -rw-r--r-- | builtin/revert.c | 4 |
4 files changed, 7 insertions, 6 deletions
diff --git a/builtin/commit.c b/builtin/commit.c index 6637a92..e89bf35 100644 --- a/builtin/commit.c +++ b/builtin/commit.c @@ -1679,7 +1679,8 @@ int cmd_commit(int argc, const char **argv, const char *prefix) flags |= SUMMARY_INITIAL_COMMIT; if (author_date_is_interesting()) flags |= SUMMARY_SHOW_AUTHOR_DATE; - print_commit_summary(prefix, &oid, flags); + print_commit_summary(the_repository, prefix, + &oid, flags); } UNLEAK(err); diff --git a/builtin/merge.c b/builtin/merge.c index 4aa6071..db22119 100644 --- a/builtin/merge.c +++ b/builtin/merge.c @@ -896,7 +896,7 @@ static int suggest_conflicts(void) filename = git_path_merge_msg(the_repository); fp = xfopen(filename, "a"); - append_conflicts_hint(&msgbuf); + append_conflicts_hint(&the_index, &msgbuf); fputs(msgbuf.buf, fp); strbuf_release(&msgbuf); fclose(fp); diff --git a/builtin/rebase--interactive.c b/builtin/rebase--interactive.c index a2ab68e..b7ce48a 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: diff --git a/builtin/revert.c b/builtin/revert.c index c93393c..cd9f068 100644 --- a/builtin/revert.c +++ b/builtin/revert.c @@ -199,10 +199,10 @@ static int run_sequencer(int argc, const char **argv, struct replay_opts *opts) return ret; } if (cmd == 'c') - return sequencer_continue(opts); + return sequencer_continue(the_repository, opts); if (cmd == 'a') return sequencer_rollback(opts); - return sequencer_pick_revisions(opts); + return sequencer_pick_revisions(the_repository, opts); } int cmd_revert(int argc, const char **argv, const char *prefix) |