diff options
| author |  Matheus Tavares <matheus.bernardino@usp.br> | 2020-01-30 17:32:22 -0300 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2020-01-31 10:45:39 -0800 |
| commit | 2dcde20e1c55fc2e3f9e9e6d48e93c39ec5661d2 (patch) | |
| tree | 9039d3dd520e915bf531c8f2f32190a4a87d9ccd /builtin/replace.c | |
| parent | sha1-file: pass git_hash_algo to write_object_file_prepare() (diff) | |
| download | tgif-2dcde20e1c55fc2e3f9e9e6d48e93c39ec5661d2.tar.xz | |
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 'builtin/replace.c')
| -rw-r--r-- | builtin/replace.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/builtin/replace.c b/builtin/replace.c index bd92dc63b9..b36d17a657 100644 --- a/builtin/replace.c +++ b/builtin/replace.c @@ -409,7 +409,8 @@ static int check_one_mergetag(struct commit *commit, struct tag *tag; int i; - hash_object_file(extra->value, extra->len, type_name(OBJ_TAG), &tag_oid); + hash_object_file(the_hash_algo, extra->value, extra->len, + type_name(OBJ_TAG), &tag_oid); tag = lookup_tag(the_repository, &tag_oid); if (!tag) return error(_("bad mergetag in commit '%s'"), ref); |