diff options
| author | Junio C Hamano <gitster@pobox.com> | 2025-09-29 09:31:08 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2025-09-29 09:31:08 -0700 |
| commit | 9fab7ec7ff80707e703f16636200be8bbde204ca (patch) | |
| tree | 57452f418c24250459347d169befcdd38b4b00d2 /pack-objects.c | |
| parent | bb69721404348ea2db0a081c41ab6ebfe75bdec8 (diff) | |
| parent | dd52a29b78d80e425be660f3b443a42e0374a7d1 (diff) | |
| download | git-9fab7ec7ff80707e703f16636200be8bbde204ca.tar.xz | |
Merge branch 'ps/packfile-store' into tb/incremental-midx-part-3.1
* ps/packfile-store:
packfile: refactor `get_packed_git_mru()` to work on packfile store
packfile: refactor `get_all_packs()` to work on packfile store
packfile: refactor `get_packed_git()` to work on packfile store
packfile: move `get_multi_pack_index()` into "midx.c"
packfile: introduce function to load and add packfiles
packfile: refactor `install_packed_git()` to work on packfile store
packfile: split up responsibilities of `reprepare_packed_git()`
packfile: refactor `prepare_packed_git()` to work on packfile store
packfile: reorder functions to avoid function declaration
odb: move kept cache into `struct packfile_store`
odb: move MRU list of packfiles into `struct packfile_store`
odb: move packfile map into `struct packfile_store`
odb: move initialization bit into `struct packfile_store`
odb: move list of packfiles into `struct packfile_store`
packfile: introduce a new `struct packfile_store`
Diffstat (limited to 'pack-objects.c')
| -rw-r--r-- | pack-objects.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/pack-objects.c b/pack-objects.c index a9d9855063..d8eb679735 100644 --- a/pack-objects.c +++ b/pack-objects.c @@ -86,6 +86,7 @@ struct object_entry *packlist_find(struct packing_data *pdata, static void prepare_in_pack_by_idx(struct packing_data *pdata) { + struct packfile_store *packs = pdata->repo->objects->packfiles; struct packed_git **mapping, *p; int cnt = 0, nr = 1U << OE_IN_PACK_BITS; @@ -95,7 +96,7 @@ static void prepare_in_pack_by_idx(struct packing_data *pdata) * (i.e. in_pack_idx also zero) should return NULL. */ mapping[cnt++] = NULL; - for (p = get_all_packs(pdata->repo); p; p = p->next, cnt++) { + for (p = packfile_store_get_all_packs(packs); p; p = p->next, cnt++) { if (cnt == nr) { free(mapping); return; |