@matheusbsbs / matheus-bagliano / commits / 84325f0730

merge,diff: remove the_repository check before prefetching blobs

Prefetching of blobs from promisor remotes was added to diff in 7fbbcb21b162 (diff: batch fetching of missing blobs, 2019-04-05). In that commit, https://lore.kernel.org/git/20190405170934.20441-1-jonathantanmy@google.com/ was squashed into https://lore.kernel.org/git/44de02e584f449481e6fb00cf35d74adf0192e9d.1553895166.git.jonathantanmy@google.com/ without the extra explanation about the squashed changes being added to the commit message; in particular, this explanation from that first link is absent: > Also, prefetch only if the repository being diffed is the_repository > (because we do not support lazy fetching for any other repository > anyway). Then, later, this checking was spread from diff.c to diffcore-rename.c and diffcore-break.c by 95acf11a3dc3 (diff: restrict when prefetching occurs, 2020-04-07) and then further split in d331dd3b0c82 (diffcore-rename: allow different missing_object_cb functions, 2021-06-22). I also copied the logic from prefetching blobs from diff.c to merge-ort.c in 2bff554b23e8 (merge-ort: add prefetching for content merges, 2021-06-22). The reason for all these checks was noted above -- we only supported lazy fetching for the_repository. However, that changed with ef830cc43412 (promisor-remote: teach lazy-fetch in any repo, 2021-06-17), so these checks are now unnecessary. Remove them. Signed-off-by: Elijah Newren <newren@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>

Elijah Newren committed Feb 21, 2026 at 23:59 UTC 84325f0730801b7638f1152ea3553530452d5c3b
4 files changed +5 -5
diff.c
+1 -1
@@ -7176,7 +7176,7 @@ void diffcore_std(struct diff_options *options)
7176 * If no prefetching occurs, diffcore_rename() will prefetch if it
7177 * decides that it needs inexact rename detection.
7178 */
7179 - if (options->repo == the_repository && repo_has_promisor_remote(the_repository) &&
7179 + if (repo_has_promisor_remote(options->repo) &&
7180 (options->output_format & output_formats_to_prefetch ||
7181 options->pickaxe_opts & DIFF_PICKAXE_KINDS_MASK))
7182 diff_queued_diff_prefetch(options->repo);
diffcore-break.c
+1 -1
@@ -69,7 +69,7 @@ static int should_break(struct repository *r,
69 oideq(&src->oid, &dst->oid))
70 return 0; /* they are the same */
71
72 - if (r == the_repository && repo_has_promisor_remote(the_repository)) {
72 + if (repo_has_promisor_remote(r)) {
73 options.missing_object_cb = diff_queued_diff_prefetch;
74 options.missing_object_data = r;
75 }
diffcore-rename.c
+2 -2
@@ -987,7 +987,7 @@ static int find_basename_matches(struct diff_options *options,
987 strintmap_set(&dests, base, i);
988 }
989
990 - if (options->repo == the_repository && repo_has_promisor_remote(the_repository)) {
990 + if (repo_has_promisor_remote(options->repo)) {
991 dpf_options.missing_object_cb = basename_prefetch;
992 dpf_options.missing_object_data = &prefetch_options;
993 }
@@ -1574,7 +1574,7 @@ void diffcore_rename_extended(struct diff_options *options,
1574
1575 /* Finish setting up dpf_options */
1576 prefetch_options.skip_unmodified = skip_unmodified;
1577 - if (options->repo == the_repository && repo_has_promisor_remote(the_repository)) {
1577 + if (repo_has_promisor_remote(options->repo)) {
1578 dpf_options.missing_object_cb = inexact_prefetch;
1579 dpf_options.missing_object_data = &prefetch_options;
1580 }
merge-ort.c
+1 -1
@@ -4438,7 +4438,7 @@ static void prefetch_for_content_merges(struct merge_options *opt,
4438 struct string_list_item *e;
4439 struct oid_array to_fetch = OID_ARRAY_INIT;
4440
4441 - if (opt->repo != the_repository || !repo_has_promisor_remote(the_repository))
4441 + if (!repo_has_promisor_remote(opt->repo))
4442 return;
4443
4444 for (e = &plist->items[plist->nr-1]; e >= plist->items; --e) {