From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 4 Mar 2026 18:53:01 +0000 (-0800)
Subject: Merge branch 'en/merge-ort-almost-wo-the-repository'
X-Git-Tag: v2.54.0-rc0~115
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ca1a1a75c185fc01ad858268b4431e835933e2eb;p=thirdparty%2Fgit.git

Merge branch 'en/merge-ort-almost-wo-the-repository'

Mark the marge-ort codebase to prevent more uses of the_repository
from getting added.

* en/merge-ort-almost-wo-the-repository:
  replay: prevent the_repository from coming back
  merge-ort: prevent the_repository from coming back
  merge-ort: replace the_hash_algo with opt->repo->hash_algo
  merge-ort: replace the_repository with opt->repo
  merge-ort: pass repository to write_tree()
  merge,diff: remove the_repository check before prefetching blobs
---

ca1a1a75c185fc01ad858268b4431e835933e2eb