dilim/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2026-06-24 08:48:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
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
This commit is contained in:
Junio C Hamano
2026-03-04 10:53:01 -08:00
parent 34af1d6e87 3249d07962
commit ca1a1a75c1
5 changed files with 61 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
diffcore-break.c
View File

@@ -69,7 +69,7 @@ static int should_break(struct repository *r,
oideq(&src->oid, &dst->oid))
return 0; /* they are the same */
if (r == the_repository && repo_has_promisor_remote(the_repository)) {
if (repo_has_promisor_remote(r)) {
options.missing_object_cb = diff_queued_diff_prefetch;
options.missing_object_data = r;
}