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

Re: [PATCH v2 1/6] merge,diff: remove the_repository check before prefetching blobs

From
Elijah Newren <newren@gmail.com>
Date
Feb 20, 2026, 18:51 UTC
Message-ID
<CABPp-BGR5Mrm30sSb9Y96VkFC5-XFTYkoAp60LMAf6gCgW3QEg@mail.gmail.com>
In-Reply-To
<aZgZAuIlCujcoEIt@pks.im>
On Fri, Feb 20, 2026 at 12:19 AM Patrick Steinhardt <ps@pks.im> wrote:
Show 17 quoted lines
>
> On Fri, Feb 20, 2026 at 01:59:43AM +0000, Elijah Newren via GitGitGadget wrote:
> > diff --git a/diff.c b/diff.c
> > index 35b903a9a0..91d81f66ad 100644
> > --- a/diff.c
> > +++ b/diff.c
> > @@ -7176,7 +7176,7 @@ void diffcore_std(struct diff_options *options)
> >        * If no prefetching occurs, diffcore_rename() will prefetch if it
> >        * decides that it needs inexact rename detection.
> >        */
> > -     if (options->repo == the_repository && repo_has_promisor_remote(the_repository) &&
> > +     if (repo_has_promisor_remote(the_repository) &&
>
> I wonder though -- shouldn't we also pass `options->repo` to
> `repo_has_promisor_remote()` now? Otherwise we may support backfill
> fetches from arbitrary repositories, but we'll only do them in case the
> main repository has a promisor remote.

Doh. Definitely yes. Amid having this patch originally be last and rebasing and whatnot, I didn't look closely enough and missed that. Will fix all the callsites and resubmit.

Previous: Patrick SteinhardtNext: Elijah Newren via GitGitGadget
Message 19 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.