From: "René Scharfe" <l.s.r@web•de>
To: Junio C Hamano <gitster@pobox•com>, Elijah Newren <newren@gmail•com>
Cc: Git List <git@vger•kernel.org>
Subject: Re: [PATCH] xdiff-interface: stop using the_repository
Date: Sun, 15 Feb 2026 19:42:44 +0100 [thread overview]
Message-ID: <ba0e8878-1f76-4491-badf-9f37364f4cec@web.de> (raw)
In-Reply-To: <xmqq8qd14rfs.fsf@gitster.g>
On 2/9/26 9:01 PM, Junio C Hamano wrote:
> Elijah Newren <newren@gmail•com> writes:
>
>> 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?
>
> Great. If we have already an appropriate structure with the
> relevant data, using it is the most welcome.
>
>> 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.
>
> True too, but as long as it is so obvious that "opt" here has .repo
> member that we can use, I do not see a reason not to.
Thanks for solving that issue! I would have sent a separate patch if
I had been quicker, because using opt->repo would not have been
obvious to me.
René
next prev parent reply other threads:[~2026-02-15 18:42 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-02-08 13:47 [PATCH] xdiff-interface: stop using the_repository René Scharfe
2026-02-09 9:48 ` Patrick Steinhardt
2026-02-09 14:14 ` René Scharfe
2026-02-09 11:15 ` Junio C Hamano
2026-02-09 15:21 ` René Scharfe
2026-02-09 17:45 ` Junio C Hamano
2026-02-09 19:24 ` René Scharfe
2026-02-09 18:57 ` Elijah Newren
2026-02-09 20:01 ` Junio C Hamano
2026-02-15 18:42 ` René Scharfe [this message]
2026-02-15 18:42 ` René Scharfe
2026-02-09 19:24 ` [PATCH v2] " René Scharfe
2026-02-10 13:28 ` Patrick Steinhardt
2026-02-10 21:31 ` Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=ba0e8878-1f76-4491-badf-9f37364f4cec@web.de \
--to=l.s.r@web$(echo .)de \
--cc=git@vger$(echo .)kernel.org \
--cc=gitster@pobox$(echo .)com \
--cc=newren@gmail$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox