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

[PATCH 0/5] Avoid the_repository in merge-ort and replay

From
Elijah Newren via GitGitGadget <gitgitgadget@gmail.com>
Date
Feb 18, 2026, 09:15 UTC
Message-ID
<pull.2048.git.1771406115.gitgitgadget@gmail.com>

Remove explicit uses of the_repository and the_hash_algo from merge-ort, and since this has now been done multiple times for both merge-ort and replay, implement a small measure to prevent them from returning to either merge-ort or replay.

See https://lore.kernel.org/git/CABPp-BH7E1Bh2g0vR3T4NEsv34DvFQPzMuJSsqtOAaWY-fFCxg@mail.gmail.com/ and https://lore.kernel.org/git/CABPp-BFuwvqiCTCCpoyT6em9_1-qrgPWHWhrufQ3UuZ+Kfkb6A@mail.gmail.com/ for recent discussions on these.

Series overview: Patches 1-3: Mostly mechanical removal of existing uses Patches 4-5: Simple hammer to prevent the problem from returning

Elijah Newren (5):
  merge-ort: pass repository to write_tree()
  merge-ort: replace the_repository with opt->repo
  merge-ort: replace the_hash_algo with opt->repo->hash_algo
  merge-ort: prevent the_repository from coming back
  replay: prevent the_repository from coming back
 merge-ort.c | 92 ++++++++++++++++++++++++++++-------------------------
 replay.c    |  2 ++
 2 files changed, 51 insertions(+), 43 deletions(-)
base-commit: 73fd77805fc6406f31c36212846d9e2541d19321
Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-2048%2Fnewren%2Favoid_the_repository-v1
Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-2048/newren/avoid_the_repository-v1
Pull-Request: https://github.com/gitgitgadget/git/pull/2048
-- 
gitgitgadget
Next: Elijah Newren via GitGitGadget
Message 1 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.