From: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Date: Fri, 21 Sep 2018 15:57:20 +0000 (+0200)
Subject: combine-diff.c: remove implicit dependency on the_index
X-Git-Tag: v2.20.0-rc0~164^2~19
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/0734f209a9a5ede0f160d82bf4069fe2421f9f5c?ds=sidebyside;hp=b78ea5fc3574a2ce262cfb37a7ea890caddd0cf5

combine-diff.c: remove implicit dependency on the_index

Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

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;