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>
Nguyễn Thái Ngọc Duy committed
Sep 21, 2018 at 17:57 UTC
0734f209a9a5ede0f160d82bf4069fe2421f9f5c
1 file changed
+2
-1
combine-diff.c
+2
-1
@@ -1054,7 +1054,8 @@ static void show_patch_diff(struct combine_diff_path *elem, int num_parent,
1054
if (is_file) {
1055
struct strbuf buf = STRBUF_INIT;
1056
1057
- if (convert_to_git(&the_index, elem->path, result, len, &buf, global_conv_flags_eol)) {
1057
+ if (convert_to_git(rev->diffopt.repo->index,
1058
+ elem->path, result, len, &buf, global_conv_flags_eol)) {
1059
free(result);
1060
result = strbuf_detach(&buf, &len);
1061
result_size = len;