From: Elijah Newren <newren@gmail.com>
Date: Mon, 09 Feb 2026 18:57:56 GMT
Subject: Re: [PATCH] xdiff-interface: stop using the_repository
Message-ID: <CABPp-BFuwvqiCTCCpoyT6em9_1-qrgPWHWhrufQ3UuZ+Kfkb6A@mail.gmail.com>
In-Reply-To: <f58fa33d-b015-4339-819a-9d91be60cd0c@web.de>

On Sun, Feb 8, 2026 at 5:47 AM René Scharfe <l.s.r@web.de> wrote:
>
...
> diff --git a/merge-ort.c b/merge-ort.c
> index e80e4f735a..a4103d56ed 100644
> --- a/merge-ort.c
> +++ b/merge-ort.c
> @@ -2136,9 +2136,9 @@ static int merge_3way(struct merge_options *opt,
>                 name2 = mkpathdup("%s:%s", opt->branch2,  pathnames[2]);
>         }
>
> -       read_mmblob(&orig, o);
> -       read_mmblob(&src1, a);
> -       read_mmblob(&src2, b);
> +       read_mmblob(&orig, the_repository->objects, o);
> +       read_mmblob(&src1, the_repository->objects, a);
> +       read_mmblob(&src2, the_repository->objects, b);
>
>         merge_status = ll_merge(result_buf, path, &orig, base,
>                                 &src1, name1, &src2, name2,

A minor point, but could we use opt->repo instead of the_repository in
merge-ort?

I've cleaned out all the_repository references before, except one in
prefetch_for_content_merges(), and would prefer folks not add more.
However, that one in prefetch_for_content_merges() and the use of
DEFAULT_ABBREV prevent us from removing USE_THE_REPOSITORY, so it's
understandable that folks keep adding them back -- in fact, others
have added a few others to this file already since I cleaned them out.
So, if you want to go ahead with this and then I submit a later patch
that cleans them all up, that's fine too.