mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'jk/pack-bitmap'

Browse Source 
* jk/pack-bitmap:
  pack-objects: do not reuse packfiles without --delta-base-offset
  add `ignore_missing_links` mode to revwalk
This commit is contained in:
Junio C Hamano
2014-04-08 12:00:32 -07:00
parent d59c12d7ad 69e4b3426a
commit 967f8c9184
6 changed files with 56 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
builtin/pack-objects.c
View File

@ -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)) {