diff options
| author | Junio C Hamano <gitster@pobox.com> | 2020-02-14 20:54:19 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-02-14 20:54:19 (GMT) |
| commit | a14aebeac330e6d58f9628a02521ea780daf0a5b (patch) | |
| tree | 930def7948667c23b7a252fec9a9b26a3a834828 /pack-bitmap.h | |
| parent | daef1b300b07c3d17d47c3bf01ebde28b62ff3fe (diff) | |
| parent | d2ea031046e8b10c2fd8120996db2dd542b30764 (diff) | |
| download | git-a14aebeac330e6d58f9628a02521ea780daf0a5b.zip git-a14aebeac330e6d58f9628a02521ea780daf0a5b.tar.gz git-a14aebeac330e6d58f9628a02521ea780daf0a5b.tar.bz2 | |
Merge branch 'jk/packfile-reuse-cleanup'
The way "git pack-objects" reuses objects stored in existing pack
to generate its result has been improved.
* jk/packfile-reuse-cleanup:
pack-bitmap: don't rely on bitmap_git->reuse_objects
pack-objects: add checks for duplicate objects
pack-objects: improve partial packfile reuse
builtin/pack-objects: introduce obj_is_packed()
pack-objects: introduce pack.allowPackReuse
csum-file: introduce hashfile_total()
pack-bitmap: simplify bitmap_has_oid_in_uninteresting()
pack-bitmap: uninteresting oid can be outside bitmapped packfile
pack-bitmap: introduce bitmap_walk_contains()
ewah/bitmap: introduce bitmap_word_alloc()
packfile: expose get_delta_base()
builtin/pack-objects: report reused packfile objects
Diffstat (limited to 'pack-bitmap.h')
| -rw-r--r-- | pack-bitmap.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/pack-bitmap.h b/pack-bitmap.h index 466c5af..bcd03b8 100644 --- a/pack-bitmap.h +++ b/pack-bitmap.h @@ -3,6 +3,7 @@ #include "ewah/ewok.h" #include "khash.h" +#include "pack.h" #include "pack-objects.h" struct commit; @@ -49,10 +50,13 @@ void test_bitmap_walk(struct rev_info *revs); 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, off_t *up_to); + uint32_t *entries, + struct bitmap **reuse_out); 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 |