On Tue, May 28, 2024 at 06:32:01AM +0000, Philip Peterson via GitGitGadget wrote:
> diff --git a/apply.c b/apply.c
> index 901b67e6255..364c05fbd06 100644
> --- a/apply.c
> +++ b/apply.c
> @@ -3218,13 +3218,13 @@ static int apply_binary(struct apply_state *state,
> return 0; /* deletion patch */
> }
>
> - if (has_object(the_repository, &oid, 0)) {
> + if (has_object(state->repo, &oid, 0)) {
> /* We already have the postimage */
> enum object_type type;
> unsigned long size;
> char *result;
>
> - result = repo_read_object_file(the_repository, &oid, &type,
> + result = repo_read_object_file(state->repo, &oid, &type,
> &size);
> if (!result)
> return error(_("the necessary postimage %s for "
We call `get_oid_hex()` in this function, which ultimately ends up
accessing `the_repository` via `the_hash_algo`. We should likely convert
those to `repo_get_oid()`.
There are also other accesses to `the_hash_algo` in this function, which
should be converted to use `state->repo->hash_algo`, as well.
> @@ -3539,9 +3539,9 @@ static int three_way_merge(struct apply_state *state,
>
> /* resolve trivial cases first */
> if (oideq(base, ours))
> - return resolve_to(image, theirs);
> + return resolve_to(state->repo, image, theirs);
> else if (oideq(base, theirs) || oideq(ours, theirs))
> - return resolve_to(image, ours);
> + return resolve_to(state->repo, image, ours);
>
> read_mmblob(&base_file, base);
> read_mmblob(&our_file, ours);
The calls to `read_mmblob()` also end up accessing `the_repository`.
Other than that the patches look good to me. Thanks for working on this!
Patrick
Attachment:
signature.asc
Description: PGP signature
