diff: make diff_populate_filespec() honor its repo argument

matheustavares · gitster · commit eb999b3295b2 · 2020-01-31T10:45:39.000-08:00
diff_populate_filespec() takes a struct repository argument but it
doesn't get passed down to read_object_file().

Signed-off-by: Matheus Tavares &lt;matheus.bernardino@usp.br&gt;
Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
diff --git 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;

Original file line number	Diff line number	Diff line change
`@@ -4024,7 +4024,7 @@ int diff_populate_filespec(struct repository *r,`
`4024`	`4024`	`return 0;`
`4025`	`4025`	`}`
`4026`	`4026`	`}`
`4027`		`- s->data = read_object_file(&s->oid, &type, &s->size);`
	`4027`	`+ s->data = repo_read_object_file(r, &s->oid, &type, &s->size);`
`4028`	`4028`	`if (!s->data)`
`4029`	`4029`	`die("unable to read %s", oid_to_hex(&s->oid));`
`4030`	`4030`	`s->should_free = 1;`