diff options
| author |  Matheus Tavares <matheus.bernardino@usp.br> | 2020-01-30 17:32:23 -0300 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2020-01-31 10:45:39 -0800 |
| commit | b98d18858187eb926912d5199533a6d2a14d5007 (patch) | |
| tree | 11390f92d70b5c1f1b185004e4c394203768a712 /builtin/index-pack.c | |
| parent | sha1-file: pass git_hash_algo to hash_object_file() (diff) | |
| download | tgif-b98d18858187eb926912d5199533a6d2a14d5007.tar.xz | |
sha1-file: allow check_object_signature() to handle any repo
Some callers of check_object_signature() can work on arbitrary
repositories, but the repo does not get passed to this function.
Instead, the_repository is always used internally. To fix possible
inconsistencies, allow the function to receive a struct repository and
make those callers pass on the repo being handled.
Signed-off-by: Matheus Tavares <matheus.bernardino@usp.br>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/index-pack.c')
| -rw-r--r-- | builtin/index-pack.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/builtin/index-pack.c b/builtin/index-pack.c index 0183610a76..acdda17d84 100644 --- a/builtin/index-pack.c +++ b/builtin/index-pack.c @@ -1384,8 +1384,9 @@ static void fix_unresolved_deltas(struct hashfile *f) if (!base_obj->data) continue; - if (check_object_signature(&d->oid, base_obj->data, - base_obj->size, type_name(type))) + if (check_object_signature(the_repository, &d->oid, + base_obj->data, base_obj->size, + type_name(type))) die(_("local object %s is corrupt"), oid_to_hex(&d->oid)); base_obj->obj = append_obj_to_pack(f, d->oid.hash, base_obj->data, base_obj->size, type); |