midx: pass `repository` to `load_multi_pack_index`
The `load_multi_pack_index` function in midx uses `the_repository` variable to access the `repository` struct. Modify the function and its callee's to send the `repository` field. This moves usage of `the_repository` to the `test-read-midx.c` file. While that is not optimal, it is okay, since the upcoming commits will slowly move the usage of `the_repository` up the layers and remove it eventually. Signed-off-by: Karthik Nayak <karthik.188@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Karthik Nayak committed
Nov 27, 2024 at 17:28 UTC
d5c2ca576a47480b03a83821041955a21a645d1a
3 files changed
+13
-10
midx.c
+6
-5
@@ -372,7 +372,8 @@ static struct multi_pack_index *load_multi_pack_index_chain(struct repository *r
372
return m;
373
}
374
375
-struct multi_pack_index *load_multi_pack_index(const char *object_dir,
375
+struct multi_pack_index *load_multi_pack_index(struct repository *r,
376
+ const char *object_dir,
377
int local)
378
{
379
struct strbuf midx_name = STRBUF_INIT;
@@ -380,10 +381,10 @@ struct multi_pack_index *load_multi_pack_index(const char *object_dir,
381
382
get_midx_filename(&midx_name, object_dir);
383
383
- m = load_multi_pack_index_one(the_repository, object_dir,
384
+ m = load_multi_pack_index_one(r, object_dir,
385
midx_name.buf, local);
386
if (!m)
386
- m = load_multi_pack_index_chain(the_repository, object_dir, local);
387
+ m = load_multi_pack_index_chain(r, object_dir, local);
388
389
strbuf_release(&midx_name);
390
@@ -727,7 +728,7 @@ int prepare_multi_pack_index_one(struct repository *r, const char *object_dir, i
728
if (!strcmp(object_dir, m_search->object_dir))
729
return 1;
730
730
- m = load_multi_pack_index(object_dir, local);
731
+ m = load_multi_pack_index(r, object_dir, local);
732
733
if (m) {
734
struct multi_pack_index *mp = r->objects->multi_pack_index;
@@ -881,7 +882,7 @@ int verify_midx_file(struct repository *r, const char *object_dir, unsigned flag
882
struct pair_pos_vs_id *pairs = NULL;
883
uint32_t i;
884
struct progress *progress = NULL;
884
- struct multi_pack_index *m = load_multi_pack_index(object_dir, 1);
885
+ struct multi_pack_index *m = load_multi_pack_index(r, object_dir, 1);
886
struct multi_pack_index *curr;
887
verify_midx_error = 0;
888
midx.h
+3
-1
@@ -97,7 +97,9 @@ void get_midx_chain_filename(struct strbuf *buf, const char *object_dir);
97
void get_split_midx_filename_ext(struct strbuf *buf, const char *object_dir,
98
const unsigned char *hash, const char *ext);
99
100
-struct multi_pack_index *load_multi_pack_index(const char *object_dir, int local);
100
+struct multi_pack_index *load_multi_pack_index(struct repository *r,
101
+ const char *object_dir,
102
+ int local);
103
int prepare_midx_pack(struct repository *r, struct multi_pack_index *m, uint32_t pack_int_id);
104
struct packed_git *nth_midxed_pack(struct multi_pack_index *m,
105
uint32_t pack_int_id);
t/helper/test-read-midx.c
+4
-4
@@ -18,7 +18,7 @@ static int read_midx_file(const char *object_dir, const char *checksum,
18
struct multi_pack_index *m;
19
20
setup_git_directory();
21
- m = load_multi_pack_index(object_dir, 1);
21
+ m = load_multi_pack_index(the_repository, object_dir, 1);
22
23
if (!m)
24
return 1;
@@ -82,7 +82,7 @@ static int read_midx_checksum(const char *object_dir)
82
struct multi_pack_index *m;
83
84
setup_git_directory();
85
- m = load_multi_pack_index(object_dir, 1);
85
+ m = load_multi_pack_index(the_repository, object_dir, 1);
86
if (!m)
87
return 1;
88
printf("%s\n", hash_to_hex(get_midx_checksum(m)));
@@ -98,7 +98,7 @@ static int read_midx_preferred_pack(const char *object_dir)
98
99
setup_git_directory();
100
101
- midx = load_multi_pack_index(object_dir, 1);
101
+ midx = load_multi_pack_index(the_repository, object_dir, 1);
102
if (!midx)
103
return 1;
104
@@ -121,7 +121,7 @@ static int read_midx_bitmapped_packs(const char *object_dir)
121
122
setup_git_directory();
123
124
- midx = load_multi_pack_index(object_dir, 1);
124
+ midx = load_multi_pack_index(the_repository, object_dir, 1);
125
if (!midx)
126
return 1;
127