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 /object-store.h | |
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 'object-store.h')
-rw-r--r-- | object-store.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/object-store.h b/object-store.h index 3a010153b7..5b047637e3 100644 --- a/object-store.h +++ b/object-store.h @@ -201,8 +201,9 @@ static inline void *repo_read_object_file(struct repository *r, /* Read and unpack an object file into memory, write memory to an object file */ int oid_object_info(struct repository *r, const struct object_id *, unsigned long *); -int hash_object_file(const void *buf, unsigned long len, - const char *type, struct object_id *oid); +int hash_object_file(const struct git_hash_algo *algo, const void *buf, + unsigned long len, const char *type, + struct object_id *oid); int write_object_file(const void *buf, unsigned long len, const char *type, struct object_id *oid); |