commit 82b474e025e89cfa294e81611c81355a73dc23a2
author Brandon Williams <bmwill@google.com> Mon Jun 12 15:13:55 2017 -0700
committer Junio C Hamano <gitster@pobox.com> Tue Jun 13 11:40:51 2017 -0700
tree 7e0114fa1a11212629ff9c47a95a59fdb69222bd
parent d6c41c20e688a1b284b92d92320ba56f639688de

convert: convert convert_to_git to take an index

Signed-off-by: Brandon Williams <bmwill@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

combine-diff.c

diff --git a/combine-diff.c b/combine-diff.c
index 2848034..74f723a 100644
--- a/combine-diff.c
+++ b/combine-diff.c
@@ -1053,7 +1053,7 @@ 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(elem->path, result, len, &buf, safe_crlf)) {
+				if (convert_to_git(&the_index, elem->path, result, len, &buf, safe_crlf)) {
 					free(result);
 					result = strbuf_detach(&buf, &len);
 					result_size = len;