path: root/diff.c
diff options
authorJunio C Hamano <>2020-02-14 20:54:22 (GMT)
committerJunio C Hamano <>2020-02-14 20:54:22 (GMT)
commit78e67cda42a440f216fc4cbfd8a9e190c5eece5a (patch)
tree6e1f8349af8dc8ba249a6fd9f4367ef8e983a55d /diff.c
parentdf04a316176d5ba44422c2c6b0cb1a9fc31901e5 (diff)
parentb98d18858187eb926912d5199533a6d2a14d5007 (diff)
Merge branch 'mt/use-passed-repo-more-in-funcs'
Some codepaths were given a repository instance as a parameter to work in the repository, but passed the_repository instance to its callees, which has been cleaned up (somewhat). * mt/use-passed-repo-more-in-funcs: sha1-file: allow check_object_signature() to handle any repo sha1-file: pass git_hash_algo to hash_object_file() sha1-file: pass git_hash_algo to write_object_file_prepare() streaming: allow open_istream() to handle any repo pack-check: use given repo's hash_algo at verify_packfile() cache-tree: use given repo's hash_algo at verify_one() diff: make diff_populate_filespec() honor its repo argument
Diffstat (limited to 'diff.c')
1 files changed, 1 insertions, 1 deletions
diff --git a/diff.c b/diff.c
index 5e4471f..f2cfbf2 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;