From: Matheus Tavares <matheus.bernardino@usp.br>
Date: Thu, 30 Jan 2020 20:32:17 +0000 (-0300)
Subject: diff: make diff_populate_filespec() honor its repo argument
X-Git-Tag: v2.26.0-rc0~54^2~6
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=eb999b3295b22680a41c0d807a8b442407b1b19f;p=thirdparty%2Fgit.git

diff: make diff_populate_filespec() honor its repo argument

diff_populate_filespec() takes a struct repository argument but it
doesn't get passed down to read_object_file().

Signed-off-by: Matheus Tavares <matheus.bernardino@usp.br>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

diff --git a/diff.c b/diff.c
index 8e2914c031..0f333c27d6 100644
--- a/diff.c
+++ b/diff.c
@@ -4024,7 +4024,7 @@ int diff_populate_filespec(struct repository *r,
 				return 0;
 			}
 		}
-		s->data = read_object_file(&s->oid, &type, &s->size);
+		s->data = repo_read_object_file(r, &s->oid, &type, &s->size);
 		if (!s->data)
 			die("unable to read %s", oid_to_hex(&s->oid));
 		s->should_free = 1;