diff options
| author | Vincent Ambo <tazjin@google.com> | 2020-05-25T23·06+0100 |
|---|---|---|
| committer | Vincent Ambo <tazjin@google.com> | 2020-05-25T23·06+0100 |
| commit | 93ba78d6f4632ef1c5228965e3edc8c0faf88c1e (patch) | |
| tree | 85730c182a9f5f492ade8e8ccdb1c2356f9900bd /third_party/git/pack-bitmap.h | |
| parent | 6f8fbf4aa4b1654ab27d4829e114538761817de0 (diff) | |
revert(3p/git): Revert merge of git upstream at v2.26.2 r/852
This causes cgit to serve error pages, which is undesirable. This reverts commit 5229c9b232de5bfa959ad6ebbb4c8192ac513352, reversing changes made to f2b211131f2347342dde63975b09cf603149f1a3.
Diffstat (limited to 'third_party/git/pack-bitmap.h')
| -rw-r--r-- | third_party/git/pack-bitmap.h | 17 |
1 files changed, 5 insertions, 12 deletions
diff --git a/third_party/git/pack-bitmap.h b/third_party/git/pack-bitmap.h index 1203120c43..00de3ec8e4 100644 --- a/third_party/git/pack-bitmap.h +++ b/third_party/git/pack-bitmap.h @@ -3,24 +3,22 @@ #include "ewah/ewok.h" #include "khash.h" -#include "pack.h" #include "pack-objects.h" struct commit; struct repository; struct rev_info; -struct list_objects_filter_options; - -static const char BITMAP_IDX_SIGNATURE[] = {'B', 'I', 'T', 'M'}; struct bitmap_disk_header { - char magic[ARRAY_SIZE(BITMAP_IDX_SIGNATURE)]; + char magic[4]; uint16_t version; uint16_t options; uint32_t entry_count; unsigned char checksum[GIT_MAX_RAWSZ]; }; +static const char BITMAP_IDX_SIGNATURE[] = {'B', 'I', 'T', 'M'}; + #define NEEDS_BITMAP (1u<<22) enum pack_bitmap_opts { @@ -46,20 +44,15 @@ struct bitmap_index *prepare_bitmap_git(struct repository *r); void count_bitmap_commit_list(struct bitmap_index *, uint32_t *commits, uint32_t *trees, uint32_t *blobs, uint32_t *tags); void traverse_bitmap_commit_list(struct bitmap_index *, - struct rev_info *revs, show_reachable_fn show_reachable); void test_bitmap_walk(struct rev_info *revs); -struct bitmap_index *prepare_bitmap_walk(struct rev_info *revs, - struct list_objects_filter_options *filter); +struct bitmap_index *prepare_bitmap_walk(struct rev_info *revs); int reuse_partial_packfile_from_bitmap(struct bitmap_index *, struct packed_git **packfile, - uint32_t *entries, - struct bitmap **reuse_out); + uint32_t *entries, off_t *up_to); int rebuild_existing_bitmaps(struct bitmap_index *, struct packing_data *mapping, kh_oid_map_t *reused_bitmaps, int show_progress); void free_bitmap_index(struct bitmap_index *); -int bitmap_walk_contains(struct bitmap_index *, - struct bitmap *bitmap, const struct object_id *oid); /* * After a traversal has been performed by prepare_bitmap_walk(), this can be |