diff options
| author | Derrick Stolee <stolee@gmail.com> | 2018-07-12 19:39:34 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-07-20 18:27:28 (GMT) |
| commit | 3715a6335c37367b4240b6bfa842dc64dedee34d (patch) | |
| tree | 2da30139275fd49e9dbd1c0145f3d97fd6d81354 /packfile.c | |
| parent | c4d25228ebb22a60f1fcb267e19c503bab708cdc (diff) | |
| download | git-3715a6335c37367b4240b6bfa842dc64dedee34d.zip git-3715a6335c37367b4240b6bfa842dc64dedee34d.tar.gz git-3715a6335c37367b4240b6bfa842dc64dedee34d.tar.bz2 | |
midx: read objects from multi-pack-index
Signed-off-by: Derrick Stolee <dstolee@microsoft.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'packfile.c')
| -rw-r--r-- | packfile.c | 8 |
1 files changed, 7 insertions, 1 deletions
@@ -1902,11 +1902,17 @@ static int fill_pack_entry(const struct object_id *oid, int find_pack_entry(struct repository *r, const struct object_id *oid, struct pack_entry *e) { struct list_head *pos; + struct multi_pack_index *m; prepare_packed_git(r); - if (!r->objects->packed_git) + if (!r->objects->packed_git && !r->objects->multi_pack_index) return 0; + for (m = r->objects->multi_pack_index; m; m = m->next) { + if (fill_midx_entry(oid, e, m)) + return 1; + } + list_for_each(pos, &r->objects->packed_git_mru) { struct packed_git *p = list_entry(pos, struct packed_git, mru); if (fill_pack_entry(oid, e, p)) { |