diff options
author | Junio C Hamano <gitster@pobox.com> | 2020-02-14 21:54:22 +0100 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2020-02-14 21:54:22 +0100 |
commit | 78e67cda42a440f216fc4cbfd8a9e190c5eece5a (patch) | |
tree | 6e1f8349af8dc8ba249a6fd9f4367ef8e983a55d /dir.c | |
parent | Merge branch 'jk/diff-honor-wserrhighlight-in-plumbing' (diff) | |
parent | sha1-file: allow check_object_signature() to handle any repo (diff) | |
download | git-78e67cda42a440f216fc4cbfd8a9e190c5eece5a.tar.xz git-78e67cda42a440f216fc4cbfd8a9e190c5eece5a.zip |
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.c | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -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; } |