diff options
| author | Junio C Hamano <gitster@pobox.com> | 2019-05-19 10:45:30 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-05-19 10:45:30 +0300 |
| commit | 454b419729142cd65466cabdb253d06c3699d098 (patch) | |
| tree | 38647bbf5a1e1cd3600606596971559ac16bb063 /object-store.h | |
| parent | 97616ca488ba460e20cbbb3374aabc97919b44ca (diff) | |
| parent | af96fe3392fb078cb5447bcb94f2ed8d79d0a4a8 (diff) | |
Merge branch 'ds/midx-too-many-packs'
The code to generate the multi-pack idx file was not prepared to
see too many packfiles and ran out of open file descriptor, which
has been corrected.
* ds/midx-too-many-packs:
midx: add packs to packed_git linked list
midx: pass a repository pointer
Diffstat (limited to 'object-store.h')
| -rw-r--r-- | object-store.h | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/object-store.h b/object-store.h index 46a1da79cc..272e01e452 100644 --- a/object-store.h +++ b/object-store.h @@ -76,7 +76,8 @@ struct packed_git { pack_keep_in_core:1, freshened:1, do_not_close:1, - pack_promisor:1; + pack_promisor:1, + multi_pack_index:1; unsigned char hash[GIT_MAX_RAWSZ]; struct revindex_entry *revindex; /* something like ".git/objects/pack/xxxxx.pack" */ @@ -129,12 +130,6 @@ struct raw_object_store { struct list_head packed_git_mru; /* - * A linked list containing all packfiles, starting with those - * contained in the multi_pack_index. - */ - struct packed_git *all_packs; - - /* * A fast, rough count of the number of objects in the repository. * These two fields are not meant for direct access. Use * approximate_object_count() instead. |