diff options
| author | Junio C Hamano <gitster@pobox.com> | 2021-09-23 22:44:45 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2021-09-23 22:44:46 +0200 |
| commit | 28caad63d0f58611a22bf5b11e4914496ecb25b1 (patch) | |
| tree | e93f71d16c3101bcd4b3fc17642dc1f540215774 /object-store.h | |
| parent | Merge branch 'en/am-abort-fix' (diff) | |
| parent | packfile: use oidset for bad objects (diff) | |
| download | git-28caad63d0f58611a22bf5b11e4914496ecb25b1.tar.xz git-28caad63d0f58611a22bf5b11e4914496ecb25b1.zip | |
Merge branch 'rs/packfile-bad-object-list-in-oidset'
Replace a handcrafted data structure used to keep track of bad
objects in the packfile API by an oidset.
* rs/packfile-bad-object-list-in-oidset:
packfile: use oidset for bad objects
packfile: convert has_packed_and_bad() to object_id
packfile: convert mark_bad_packed_object() to object_id
midx: inline nth_midxed_pack_entry()
oidset: make oidset_size() an inline function
Diffstat (limited to 'object-store.h')
| -rw-r--r-- | object-store.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/object-store.h b/object-store.h index ebc55274e6..c5130d8bae 100644 --- a/object-store.h +++ b/object-store.h @@ -10,6 +10,7 @@ #include "khash.h" #include "dir.h" #include "oidtree.h" +#include "oidset.h" struct object_directory { struct object_directory *next; @@ -76,9 +77,8 @@ struct packed_git { const void *index_data; size_t index_size; uint32_t num_objects; - uint32_t num_bad_objects; uint32_t crc_offset; - unsigned char *bad_object_sha1; + struct oidset bad_objects; int index_version; time_t mtime; int pack_fd; |