Skip to content

Commit 0734f20

Browse files
pcloudsgitster
authored andcommitted
combine-diff.c: remove implicit dependency on the_index
Signed-off-by: Nguyễn Thái Ngọc Duy <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent b78ea5f commit 0734f20

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

combine-diff.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1054,7 +1054,8 @@ static void show_patch_diff(struct combine_diff_path *elem, int num_parent,
10541054
if (is_file) {
10551055
struct strbuf buf = STRBUF_INIT;
10561056

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)) {
10581059
free(result);
10591060
result = strbuf_detach(&buf, &len);
10601061
result_size = len;

0 commit comments

Comments
 (0)