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

Merge branch 'jk/disable-pack-reuse-when-broken'

Browse Source 
"pack-objects" can stream a slice of an existing packfile out when
the pack bitmap can tell that the reachable objects are all needed
in the output, without inspecting individual objects.  This
strategy however would not work well when "--local" and other
options are in use, and need to be disabled.

* jk/disable-pack-reuse-when-broken:
  t5310: fix "; do" style
  pack-objects: disable pack reuse for object-selection options
This commit is contained in:
Junio C Hamano
2017-05-29 12:34:44 +09:00
parent 6b526ced6f da5a1f8100
commit 137a2613a0
2 changed files with 50 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
builtin/pack-objects.c
View File

@ -2728,7 +2728,11 @@ static void loosen_unused_packed_objects(struct rev_info *revs)
*/
static int pack_options_allow_reuse(void)
{
return pack_to_stdout && allow_ofs_delta;
return pack_to_stdout &&
allow_ofs_delta &&
!ignore_packed_keep &&
(!local || !have_non_local_packs) &&
!incremental;
}
static int get_object_list_from_bitmap(struct rev_info *revs)