diff options
| author | Junio C Hamano <gitster@pobox.com> | 2017-06-04 04:21:02 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-06-04 04:21:02 +0300 |
| commit | f305016f428db71df44d3e0072e937a8739b4e1a (patch) | |
| tree | 8ddc380e646f39dee1ba9be093af581507f662d3 /builtin | |
| parent | 70d19a436dfdc2375f7c80dac85bc08160f6a0f7 (diff) | |
| parent | da5a1f81008f89f4e533006df8fa536e43c9c677 (diff) | |
Merge branch 'jk/disable-pack-reuse-when-broken' into maint
"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
Diffstat (limited to 'builtin')
| -rw-r--r-- | builtin/pack-objects.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/builtin/pack-objects.c b/builtin/pack-objects.c index 0fe35d1b5a..50e01aa80e 100644 --- a/builtin/pack-objects.c +++ b/builtin/pack-objects.c @@ -2717,7 +2717,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) |