diff options
| author | Junio C Hamano <gitster@pobox.com> | 2025-07-29 11:34:08 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2025-07-29 11:34:08 -0700 |
| commit | 70b7b03f986f5aa43d56e7bbf1fee149d790d06f (patch) | |
| tree | c7d309179296d69a49d4e972898b0e1c2ff0793d /odb.h | |
| parent | e813a0200a7121b97fec535f0d0b460b0a33356c (diff) | |
| parent | ec865d94d4615c00fbf9ac50f4274b1d3fbf73a6 (diff) | |
| download | git-70b7b03f986f5aa43d56e7bbf1fee149d790d06f.tar.gz | |
Merge branch 'ps/object-store-midx' into ps/object-store-midx-dedup-info
* ps/object-store-midx:
midx: remove now-unused linked list of multi-pack indices
packfile: stop using linked MIDX list in `get_all_packs()`
packfile: stop using linked MIDX list in `find_pack_entry()`
packfile: refactor `get_multi_pack_index()` to work on sources
midx: stop using linked list when closing MIDX
packfile: refactor `prepare_packed_git_one()` to work on sources
midx: start tracking per object database source
Diffstat (limited to 'odb.h')
| -rw-r--r-- | odb.h | 16 |
1 files changed, 8 insertions, 8 deletions
@@ -13,6 +13,7 @@ struct oidmap; struct oidtree; struct strbuf; struct repository; +struct multi_pack_index; /* * Compute the exact path an alternate is at and returns it. In case of @@ -56,6 +57,13 @@ struct odb_source { struct loose_object_map *loose_map; /* + * private data + * + * should only be accessed directly by packfile.c and midx.c + */ + struct multi_pack_index *midx; + + /* * This is a temporary object store created by the tmp_objdir * facility. Disable ref updates since the objects in the store * might be discarded on rollback. @@ -75,7 +83,6 @@ struct odb_source { }; struct packed_git; -struct multi_pack_index; struct cached_object_entry; /* @@ -119,13 +126,6 @@ struct object_database { /* * private data * - * should only be accessed directly by packfile.c and midx.c - */ - struct multi_pack_index *multi_pack_index; - - /* - * private data - * * should only be accessed directly by packfile.c */ |