diff options
Diffstat (limited to 'builtin/pack-objects.c')
| -rw-r--r-- | builtin/pack-objects.c | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/builtin/pack-objects.c b/builtin/pack-objects.c index c1f4310..de36c60 100644 --- a/builtin/pack-objects.c +++ b/builtin/pack-objects.c @@ -2439,12 +2439,23 @@ static void loosen_unused_packed_objects(struct rev_info *revs) } } +/* + * This tracks any options which a reader of the pack might + * not understand, and which would therefore prevent blind reuse + * of what we have on disk. + */ +static int pack_options_allow_reuse(void) +{ + return allow_ofs_delta; +} + static int get_object_list_from_bitmap(struct rev_info *revs) { if (prepare_bitmap_walk(revs) < 0) return -1; - if (!reuse_partial_packfile_from_bitmap( + if (pack_options_allow_reuse() && + !reuse_partial_packfile_from_bitmap( &reuse_packfile, &reuse_packfile_objects, &reuse_packfile_offset)) { |