diff options
| author | Junio C Hamano <gitster@pobox.com> | 2026-03-04 10:53:01 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2026-03-04 10:53:02 -0800 |
| commit | ca1a1a75c185fc01ad858268b4431e835933e2eb (patch) | |
| tree | 67eb1846a59aa9dc7a30e9ffa4f9d45ba3b4933e /diffcore-break.c | |
| parent | 34af1d6e879c172ed670d8e94ce107cf120a8c74 (diff) | |
| parent | 3249d07962f081bd84bace9ca7f808575e2cae56 (diff) | |
| download | git-ca1a1a75c185fc01ad858268b4431e835933e2eb.tar.xz | |
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
Diffstat (limited to 'diffcore-break.c')
| -rw-r--r-- | diffcore-break.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/diffcore-break.c b/diffcore-break.c index 9b11fe2fa0..17b5ad1fed 100644 --- a/diffcore-break.c +++ b/diffcore-break.c @@ -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; } |