diff options
| author | Junio C Hamano <gitster@pobox.com> | 2020-02-14 21:54:19 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-02-14 21:54:19 +0100 |
| commit | a14aebeac330e6d58f9628a02521ea780daf0a5b (patch) | |
| tree | 930def7948667c23b7a252fec9a9b26a3a834828 /packfile.c | |
| parent | Merge branch 'hw/advice-add-nothing' (diff) | |
| parent | pack-bitmap: don't rely on bitmap_git->reuse_objects (diff) | |
| download | git-a14aebeac330e6d58f9628a02521ea780daf0a5b.tar.xz git-a14aebeac330e6d58f9628a02521ea780daf0a5b.zip | |
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 'packfile.c')
| -rw-r--r-- | packfile.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/packfile.c b/packfile.c index 7e7c04e4d8..514bc57cc9 100644 --- a/packfile.c +++ b/packfile.c @@ -1162,11 +1162,11 @@ const struct packed_git *has_packed_and_bad(struct repository *r, return NULL; } -static off_t get_delta_base(struct packed_git *p, - struct pack_window **w_curs, - off_t *curpos, - enum object_type type, - off_t delta_obj_offset) +off_t get_delta_base(struct packed_git *p, + struct pack_window **w_curs, + off_t *curpos, + enum object_type type, + off_t delta_obj_offset) { unsigned char *base_info = use_pack(p, w_curs, *curpos, NULL); off_t base_offset; |