Re: [PATCH 4/5] merge-ort: prevent the_repository from coming back
- From
Elijah Newren <newren@gmail.com>
- Date
- Feb 19, 2026, 16:00 UTC
- Message-ID
- <CABPp-BHiLxeH1Aw0Ag9voQfYghSW5B80R21TZURAX5eP+mj2AQ@mail.gmail.com>
- In-Reply-To
- <8ac118b7-2d39-4a0c-9a61-d0c7b045b231@app.fastmail.com>
On Thu, Feb 19, 2026 at 1:48 AM Kristoffer Haugsbakk <kristofferhaugsbakk@fastmail.com> wrote:
Show 23 quoted lines
> > On Wed, Feb 18, 2026, at 10:15, Elijah Newren via GitGitGadget wrote: > > From: Elijah Newren <newren@gmail.com> > > > > There are two things preventing us from removing our usage of > > USE_THE_REPOSITORY_VARIABLE: one necessary use of the_repository in > > prefetch_for_content_merges(), and the use of DEFAULT_ABBREV. We have > > removed all other uses of the_repository in merge-ort before (multiple > > times), but without removing that definition, they keep coming back. > > > > Define the_repository to make it a compilation error so that they don't > > come back any more, with a special carve-out for > > prefetch_for_content_merges(). > > > > Signed-off-by: Elijah Newren <newren@gmail.com> > > --- > >[snip] > > +#define the_repository DO_NOT_USE_THE_REPOSITORY > > + > >[snip] > > +#define the_repository DO_NOT_USE_the_repository > > Here the casing is different?
Oops. Will fix; thanks for taking a look.