From: Kristoffer Haugsbakk <kristofferhaugsbakk@fastmail.com>
Date: Thu, 19 Feb 2026 09:48:06 GMT
Subject: Re: [PATCH 4/5] merge-ort: prevent the_repository from coming back
Message-ID: <8ac118b7-2d39-4a0c-9a61-d0c7b045b231@app.fastmail.com>
In-Reply-To: <46c24e0d05a91f830e400914a7e446afab320859.1771406115.git.gitgitgadget@gmail.com>

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?

> +
>  static int process_entries(struct merge_options *opt,
>  			   struct object_id *result_oid)
>  {