diff options
| author | Matheus Tavares <matheus.bernardino@usp.br> | 2020-01-30 23:32:22 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-01-31 21:45:39 +0300 |
| commit | 2dcde20e1c55fc2e3f9e9e6d48e93c39ec5661d2 (patch) | |
| tree | 9039d3dd520e915bf531c8f2f32190a4a87d9ccd /diffcore-rename.c | |
| parent | 7ad5c44d9ce559703245d389aa71c4445dc9359c (diff) | |
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 'diffcore-rename.c')
| -rw-r--r-- | diffcore-rename.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/diffcore-rename.c b/diffcore-rename.c index 531d7adeaf..e189f407af 100644 --- a/diffcore-rename.c +++ b/diffcore-rename.c @@ -263,8 +263,8 @@ static unsigned int hash_filespec(struct repository *r, if (!filespec->oid_valid) { if (diff_populate_filespec(r, filespec, 0)) return 0; - hash_object_file(filespec->data, filespec->size, "blob", - &filespec->oid); + hash_object_file(r->hash_algo, filespec->data, filespec->size, + "blob", &filespec->oid); } return oidhash(&filespec->oid); } |