global/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2026-03-04 14:37:35 +01:00
Code Issues Packages Projects Releases Wiki Activity

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

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-03 11:08:22 -08:00
parent 69b4bf4730 3249d07962
commit e4ab8972f6
5 changed files with 61 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
diff.c
View File

@@ -7194,7 +7194,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(options->repo) &&
(options->output_format & output_formats_to_prefetch ||
options->pickaxe_opts & DIFF_PICKAXE_KINDS_MASK))
diff_queued_diff_prefetch(options->repo);