packfile: add repository argument to prepare_packed_git
Add a repository argument to allow prepare_packed_git callers to be more specific about which repository to handle. See commit "sha1_file: add repository argument to link_alt_odb_entry" for an explanation of the #define trick. Signed-off-by: Stefan Beller <sbeller@google.com> Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Stefan Beller committed
Mar 23, 2018 at 18:45 UTC
6fdb4e9f5a883aa3d96fc19b3e08d3449d53ea0c
12 files changed
+18
-17
builtin/count-objects.c
+1
-1
@@ -123,7 +123,7 @@ int cmd_count_objects(int argc, const char **argv, const char *prefix)
123
struct strbuf pack_buf = STRBUF_INIT;
124
struct strbuf garbage_buf = STRBUF_INIT;
125
if (!get_packed_git(the_repository))
126
- prepare_packed_git();
126
+ prepare_packed_git(the_repository);
127
for (p = get_packed_git(the_repository); p; p = p->next) {
128
if (!p->pack_local)
129
continue;
builtin/fsck.c
+1
-1
@@ -729,7 +729,7 @@ int cmd_fsck(int argc, const char **argv, const char *prefix)
729
uint32_t total = 0, count = 0;
730
struct progress *progress = NULL;
731
732
- prepare_packed_git();
732
+ prepare_packed_git(the_repository);
733
734
if (show_progress) {
735
for (p = get_packed_git(the_repository); p;
builtin/gc.c
+1
-1
@@ -174,7 +174,7 @@ static int too_many_packs(void)
174
if (gc_auto_pack_limit <= 0)
175
return 0;
176
177
- prepare_packed_git();
177
+ prepare_packed_git(the_repository);
178
for (cnt = 0, p = get_packed_git(the_repository); p; p = p->next) {
179
if (!p->pack_local)
180
continue;
builtin/pack-objects.c
+1
-1
@@ -3152,7 +3152,7 @@ int cmd_pack_objects(int argc, const char **argv, const char *prefix)
3152
if (progress && all_progress_implied)
3153
progress = 2;
3154
3155
- prepare_packed_git();
3155
+ prepare_packed_git(the_repository);
3156
if (ignore_packed_keep) {
3157
struct packed_git *p;
3158
for (p = get_packed_git(the_repository); p; p = p->next)
builtin/pack-redundant.c
+1
-1
@@ -631,7 +631,7 @@ int cmd_pack_redundant(int argc, const char **argv, const char *prefix)
631
break;
632
}
633
634
- prepare_packed_git();
634
+ prepare_packed_git(the_repository);
635
636
if (load_all_packs)
637
load_all();
fast-import.c
+1
-1
@@ -3473,7 +3473,7 @@ int cmd_main(int argc, const char **argv)
3473
rc_free[i].next = &rc_free[i + 1];
3474
rc_free[cmd_save - 1].next = NULL;
3475
3476
- prepare_packed_git();
3476
+ prepare_packed_git(the_repository);
3477
start_packfile();
3478
set_die_routine(die_nicely);
3479
set_checkpoint_signal();
http-backend.c
+1
-1
@@ -519,7 +519,7 @@ static void get_info_packs(struct strbuf *hdr, char *arg)
519
size_t cnt = 0;
520
521
select_getanyfile(hdr);
522
- prepare_packed_git();
522
+ prepare_packed_git(the_repository);
523
for (p = get_packed_git(the_repository); p; p = p->next) {
524
if (p->pack_local)
525
cnt++;
pack-bitmap.c
+1
-1
@@ -336,7 +336,7 @@ static int open_pack_bitmap(void)
336
337
assert(!bitmap_git.map && !bitmap_git.loaded);
338
339
- prepare_packed_git();
339
+ prepare_packed_git(the_repository);
340
for (p = get_packed_git(the_repository); p; p = p->next) {
341
if (open_pack_bitmap_1(p) == 0)
342
ret = 0;
packfile.c
+5
-5
@@ -817,7 +817,7 @@ unsigned long approximate_object_count(void)
817
unsigned long count;
818
struct packed_git *p;
819
820
- prepare_packed_git();
820
+ prepare_packed_git(the_repository);
821
count = 0;
822
for (p = the_repository->objects->packed_git; p; p = p->next) {
823
if (open_pack_index(p))
@@ -884,7 +884,7 @@ static void prepare_packed_git_mru(struct repository *r)
884
list_add_tail(&p->mru, &r->objects->packed_git_mru);
885
}
886
887
-void prepare_packed_git(void)
887
+void prepare_packed_git_the_repository(void)
888
{
889
struct alternate_object_database *alt;
890
@@ -903,7 +903,7 @@ void reprepare_packed_git(void)
903
{
904
the_repository->objects->approximate_object_count_valid = 0;
905
the_repository->objects->packed_git_initialized = 0;
906
- prepare_packed_git();
906
+ prepare_packed_git(the_repository);
907
}
908
909
struct packed_git *get_packed_git(struct repository *r)
@@ -1854,7 +1854,7 @@ int find_pack_entry(const unsigned char *sha1, struct pack_entry *e)
1854
{
1855
struct list_head *pos;
1856
1857
- prepare_packed_git();
1857
+ prepare_packed_git(the_repository);
1858
if (!the_repository->objects->packed_git)
1859
return 0;
1860
@@ -1908,7 +1908,7 @@ int for_each_packed_object(each_packed_object_fn cb, void *data, unsigned flags)
1908
int r = 0;
1909
int pack_errors = 0;
1910
1911
- prepare_packed_git();
1911
+ prepare_packed_git(the_repository);
1912
for (p = the_repository->objects->packed_git; p; p = p->next) {
1913
if ((flags & FOR_EACH_OBJECT_LOCAL_ONLY) && !p->pack_local)
1914
continue;
packfile.h
+2
-1
@@ -34,7 +34,8 @@ extern struct packed_git *parse_pack_index(unsigned char *sha1, const char *idx_
34
#define PACKDIR_FILE_GARBAGE 4
35
extern void (*report_garbage)(unsigned seen_bits, const char *path);
36
37
-extern void prepare_packed_git(void);
37
+#define prepare_packed_git(r) prepare_packed_git_##r()
38
+extern void prepare_packed_git_the_repository(void);
39
extern void reprepare_packed_git(void);
40
extern void install_packed_git(struct repository *r, struct packed_git *pack);
41
server-info.c
+1
-1
@@ -201,7 +201,7 @@ static void init_pack_info(const char *infofile, int force)
201
objdir = get_object_directory();
202
objdirlen = strlen(objdir);
203
204
- prepare_packed_git();
204
+ prepare_packed_git(the_repository);
205
for (p = get_packed_git(the_repository); p; p = p->next) {
206
/* we ignore things on alternate path since they are
207
* not available to the pullers in general.
sha1_name.c
+2
-2
@@ -196,7 +196,7 @@ static void find_short_packed_object(struct disambiguate_state *ds)
196
{
197
struct packed_git *p;
198
199
- prepare_packed_git();
199
+ prepare_packed_git(the_repository);
200
for (p = get_packed_git(the_repository); p && !ds->ambiguous;
201
p = p->next)
202
unique_in_pack(p, ds);
@@ -567,7 +567,7 @@ static void find_abbrev_len_packed(struct min_abbrev_data *mad)
567
{
568
struct packed_git *p;
569
570
- prepare_packed_git();
570
+ prepare_packed_git(the_repository);
571
for (p = get_packed_git(the_repository); p; p = p->next)
572
find_abbrev_len_for_pack(p, mad);
573
}