From: Nguyễn Thái Ngọc Duy Date: Mon, 03 Sep 2018 18:09:12 GMT Subject: [PATCH v2 04/24] combine-diff.c: remove implicit dependency on the_index Message-ID: <20180903180932.32260-5-pclouds@gmail.com> In-Reply-To: <20180903180932.32260-1-pclouds@gmail.com> Signed-off-by: Nguyễn Thái Ngọc Duy --- combine-diff.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/combine-diff.c b/combine-diff.c index de7695e728..4fa7707b57 100644 --- a/combine-diff.c +++ b/combine-diff.c @@ -1054,7 +1054,8 @@ static void show_patch_diff(struct combine_diff_path *elem, int num_parent, if (is_file) { struct strbuf buf = STRBUF_INIT; - if (convert_to_git(&the_index, elem->path, result, len, &buf, global_conv_flags_eol)) { + if (convert_to_git(rev->diffopt.repo->index, + elem->path, result, len, &buf, global_conv_flags_eol)) { free(result); result = strbuf_detach(&buf, &len); result_size = len; -- 2.19.0.rc0.337.ge906d732e7