diff options
author | Junio C Hamano <gitster@pobox.com> | 2018-09-17 22:53:50 +0200 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2018-09-17 22:53:50 +0200 |
commit | 49f210fd5279eeb0106cd7e4383a1c4454d30428 (patch) | |
tree | 980ae4660060e0b6e8d10600bb71262d1b200166 /pack-objects.c | |
parent | Merge branch 'jk/branch-l-1-repurpose' (diff) | |
parent | pack-objects: consider packs in multi-pack-index (diff) | |
download | git-49f210fd5279eeb0106cd7e4383a1c4454d30428.tar.xz git-49f210fd5279eeb0106cd7e4383a1c4454d30428.zip |
Merge branch 'ds/multi-pack-index'
When there are too many packfiles in a repository (which is not
recommended), looking up an object in these would require
consulting many pack .idx files; a new mechanism to have a single
file that consolidates all of these .idx files is introduced.
* ds/multi-pack-index: (32 commits)
pack-objects: consider packs in multi-pack-index
midx: test a few commands that use get_all_packs
treewide: use get_all_packs
packfile: add all_packs list
midx: fix bug that skips midx with alternates
midx: stop reporting garbage
midx: mark bad packed objects
multi-pack-index: store local property
multi-pack-index: provide more helpful usage info
midx: clear midx on repack
packfile: skip loading index if in multi-pack-index
midx: prevent duplicate packfile loads
midx: use midx in approximate_object_count
midx: use existing midx when writing new one
midx: use midx in abbreviation calculations
midx: read objects from multi-pack-index
config: create core.multiPackIndex setting
midx: write object offsets
midx: write object id fanout chunk
midx: write object ids in a chunk
...
Diffstat (limited to 'pack-objects.c')
-rw-r--r-- | pack-objects.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pack-objects.c b/pack-objects.c index 6ef87e5683..d04cfa8e9f 100644 --- a/pack-objects.c +++ b/pack-objects.c @@ -99,7 +99,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_packed_git(the_repository); p; p = p->next, cnt++) { + for (p = get_all_packs(the_repository); p; p = p->next, cnt++) { if (cnt == nr) { free(mapping); return; |