aboutsummaryrefslogtreecommitdiffstats
path: root/dir.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2020-02-14 12:54:22 -0800
committerJunio C Hamano <gitster@pobox.com>2020-02-14 12:54:22 -0800
commit78e67cda42a440f216fc4cbfd8a9e190c5eece5a (patch)
tree6e1f8349af8dc8ba249a6fd9f4367ef8e983a55d /dir.c
parentdf04a316176d5ba44422c2c6b0cb1a9fc31901e5 (diff)
parentb98d18858187eb926912d5199533a6d2a14d5007 (diff)
downloadgit-78e67cda42a440f216fc4cbfd8a9e190c5eece5a.tar.gz
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 'dir.c')
-rw-r--r--dir.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/dir.c b/dir.c
index 014741d1ba..0dc0f113c0 100644
--- a/dir.c
+++ b/dir.c
@@ -1074,8 +1074,8 @@ static int add_patterns(const char *fname, const char *base, int baselen,
oidcpy(&oid_stat->oid,
&istate->cache[pos]->oid);
else
- hash_object_file(buf, size, "blob",
- &oid_stat->oid);
+ hash_object_file(the_hash_algo, buf, size,
+ "blob", &oid_stat->oid);
fill_stat_data(&oid_stat->stat, &st);
oid_stat->valid = 1;
}