git/list[1] front-page[2] threads[3] people[4] search[5] about
 

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.
Previous: Kristoffer HaugsbakkNext: Patrick Steinhardt
Message 9 of 34 in “Avoid the_repository in merge-ort and replay”
  1. 0/5 Avoid the_repository in merge-ort and replayElijah Newren via GitGitGadget, Feb 18, 2026
  2. 1/5 merge-ort: pass repository to write_tree()Elijah Newren via GitGitGadget, Feb 18, 2026
  3. 2/5 merge-ort: replace the_repository with opt->repoElijah Newren via GitGitGadget, Feb 18, 2026
  4. 3/5 merge-ort: replace the_hash_algo with opt->repo->hash_algoElijah Newren via GitGitGadget, Feb 18, 2026
  5. Patrick SteinhardtFeb 19, 2026
  6. Elijah NewrenFeb 19, 2026
  7. 4/5 merge-ort: prevent the_repository from coming backElijah Newren via GitGitGadget, Feb 18, 2026
  8. Kristoffer HaugsbakkFeb 19, 2026
  9. Elijah NewrenFeb 19, 2026
  10. Patrick SteinhardtFeb 19, 2026
  11. Elijah NewrenFeb 19, 2026
  12. Junio C HamanoFeb 19, 2026
  13. Elijah NewrenFeb 19, 2026
  14. 5/5 replay: prevent the_repository from coming backElijah Newren via GitGitGadget, Feb 18, 2026
  15. Patrick SteinhardtFeb 19, 2026
  16. 0/6 Avoid the_repository in merge-ort and replayElijah Newren via GitGitGadget, Feb 20, 2026
  17. 1/6 merge,diff: remove the_repository check before prefetching blobsElijah Newren via GitGitGadget, Feb 20, 2026
  18. Patrick SteinhardtFeb 20, 2026
  19. Elijah NewrenFeb 20, 2026
  20. 2/6 merge-ort: pass repository to write_tree()Elijah Newren via GitGitGadget, Feb 20, 2026
  21. 3/6 merge-ort: replace the_repository with opt->repoElijah Newren via GitGitGadget, Feb 20, 2026
  22. 4/6 merge-ort: replace the_hash_algo with opt->repo->hash_algoElijah Newren via GitGitGadget, Feb 20, 2026
  23. 5/6 merge-ort: prevent the_repository from coming backElijah Newren via GitGitGadget, Feb 20, 2026
  24. 6/6 replay: prevent the_repository from coming backElijah Newren via GitGitGadget, Feb 20, 2026
  25. 0/6 Avoid the_repository in merge-ort and replayElijah Newren via GitGitGadget, Feb 21, 2026
  26. 1/6 merge,diff: remove the_repository check before prefetching blobsElijah Newren via GitGitGadget, Feb 21, 2026
  27. 2/6 merge-ort: pass repository to write_tree()Elijah Newren via GitGitGadget, Feb 21, 2026
  28. 3/6 merge-ort: replace the_repository with opt->repoElijah Newren via GitGitGadget, Feb 21, 2026
  29. 4/6 merge-ort: replace the_hash_algo with opt->repo->hash_algoElijah Newren via GitGitGadget, Feb 21, 2026
  30. 5/6 merge-ort: prevent the_repository from coming backElijah Newren via GitGitGadget, Feb 21, 2026
  31. Junio C HamanoFeb 22, 2026
  32. Elijah NewrenFeb 22, 2026
  33. Derrick StoleeFeb 23, 2026
  34. Patrick SteinhardtFeb 24, 2026

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.