builtin/repack.c: avoid "the_repository" when taking a ref snapshot
Avoid using "the_repository" in various MIDX-related ref snapshotting functions. Signed-off-by: Taylor Blau <me@ttaylorr.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Taylor Blau committed
Oct 15, 2025 at 18:27 UTC
94d99de7724bce0325de8293fa1c2312d5960d7c
1 file changed
+9
-7
builtin/repack.c
+9
-7
@@ -771,6 +771,7 @@ static int midx_has_unknown_packs(char **midx_pack_names,
771
}
772
773
struct midx_snapshot_ref_data {
774
+ struct repository *repo;
775
struct tempfile *f;
776
struct oidset seen;
777
int preferred;
@@ -784,13 +785,13 @@ static int midx_snapshot_ref_one(const char *refname UNUSED,
785
struct midx_snapshot_ref_data *data = _data;
786
struct object_id peeled;
787
787
- if (!peel_iterated_oid(the_repository, oid, &peeled))
788
+ if (!peel_iterated_oid(data->repo, oid, &peeled))
789
oid = &peeled;
790
791
if (oidset_insert(&data->seen, oid))
792
return 0; /* already seen */
793
793
- if (odb_read_object_info(the_repository->objects, oid, NULL) != OBJ_COMMIT)
794
+ if (odb_read_object_info(data->repo->objects, oid, NULL) != OBJ_COMMIT)
795
return 0;
796
797
fprintf(data->f->fp, "%s%s\n", data->preferred ? "+" : "",
@@ -799,11 +800,12 @@ static int midx_snapshot_ref_one(const char *refname UNUSED,
800
return 0;
801
}
802
802
-static void midx_snapshot_refs(struct tempfile *f)
803
+static void midx_snapshot_refs(struct repository *repo, struct tempfile *f)
804
{
805
struct midx_snapshot_ref_data data;
805
- const struct string_list *preferred = bitmap_preferred_tips(the_repository);
806
+ const struct string_list *preferred = bitmap_preferred_tips(repo);
807
808
+ data.repo = repo;
809
data.f = f;
810
data.preferred = 0;
811
oidset_init(&data.seen, 0);
@@ -817,13 +819,13 @@ static void midx_snapshot_refs(struct tempfile *f)
819
820
data.preferred = 1;
821
for_each_string_list_item(item, preferred)
820
- refs_for_each_ref_in(get_main_ref_store(the_repository),
822
+ refs_for_each_ref_in(get_main_ref_store(repo),
823
item->string,
824
midx_snapshot_ref_one, &data);
825
data.preferred = 0;
826
}
827
826
- refs_for_each_ref(get_main_ref_store(the_repository),
828
+ refs_for_each_ref(get_main_ref_store(repo),
829
midx_snapshot_ref_one, &data);
830
831
if (close_tempfile_gently(f)) {
@@ -1397,7 +1399,7 @@ int cmd_repack(int argc,
1399
"bitmap-ref-tips");
1400
1401
refs_snapshot = xmks_tempfile(path.buf);
1400
- midx_snapshot_refs(refs_snapshot);
1402
+ midx_snapshot_refs(repo, refs_snapshot);
1403
1404
strbuf_release(&path);
1405
}