diff options
author | Matheus Tavares <matheus.bernardino@usp.br> | 2020-01-30 21:32:22 +0100 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2020-01-31 19:45:39 +0100 |
commit | 2dcde20e1c55fc2e3f9e9e6d48e93c39ec5661d2 (patch) | |
tree | 9039d3dd520e915bf531c8f2f32190a4a87d9ccd /object-store.h | |
parent | sha1-file: pass git_hash_algo to write_object_file_prepare() (diff) | |
download | git-2dcde20e1c55fc2e3f9e9e6d48e93c39ec5661d2.tar.xz git-2dcde20e1c55fc2e3f9e9e6d48e93c39ec5661d2.zip |
sha1-file: pass git_hash_algo to hash_object_file()
Allow hash_object_file() to work on arbitrary repos by introducing a
git_hash_algo parameter. Change callers which have a struct repository
pointer in their scope to pass on the git_hash_algo from the said repo.
For all other callers, pass on the_hash_algo, which was already being
used internally at hash_object_file(). This functionality will be used
in the following patch to make check_object_signature() be able to work
on arbitrary repos (which, in turn, will be used to fix an
inconsistency at object.c:parse_object()).
Signed-off-by: Matheus Tavares <matheus.bernardino@usp.br>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
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 55ee639350..bb19f4aa99 100644 --- a/object-store.h +++ b/object-store.h @@ -198,8 +198,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); |