diff options
| author | Nguyễn Thái Ngọc Duy <pclouds@gmail.com> | 2018-11-10 06:48:56 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-11-12 06:50:05 +0100 |
| commit | f11c95805495fcb588f767ffab193f2aed328eab (patch) | |
| tree | 067ad17a503c501836dfb4cf51efcb621b58015d /builtin/merge.c | |
| parent | transport.c: remove implicit dependency on the_index (diff) | |
| download | git-f11c95805495fcb588f767ffab193f2aed328eab.tar.xz git-f11c95805495fcb588f767ffab193f2aed328eab.zip | |
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/merge.c')
| -rw-r--r-- | builtin/merge.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/merge.c b/builtin/merge.c index 4aa6071598..db22119c93 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); |