Merge branch 'nd/pack-deltify-regression-fix'
In a recent update in 2.18 era, "git pack-objects" started producing a larger than necessary packfiles by missing opportunities to use large deltas. * nd/pack-deltify-regression-fix: pack-objects: fix performance issues on packing large deltas
This commit is contained in:
@ -146,6 +146,8 @@ void prepare_packing_data(struct packing_data *pdata)
|
||||
|
||||
pdata->oe_size_limit = git_env_ulong("GIT_TEST_OE_SIZE",
|
||||
1U << OE_SIZE_BITS);
|
||||
pdata->oe_delta_size_limit = git_env_ulong("GIT_TEST_OE_DELTA_SIZE",
|
||||
1UL << OE_DELTA_SIZE_BITS);
|
||||
}
|
||||
|
||||
struct object_entry *packlist_alloc(struct packing_data *pdata,
|
||||
@ -160,6 +162,8 @@ struct object_entry *packlist_alloc(struct packing_data *pdata,
|
||||
|
||||
if (!pdata->in_pack_by_idx)
|
||||
REALLOC_ARRAY(pdata->in_pack, pdata->nr_alloc);
|
||||
if (pdata->delta_size)
|
||||
REALLOC_ARRAY(pdata->delta_size, pdata->nr_alloc);
|
||||
}
|
||||
|
||||
new_entry = pdata->objects + pdata->nr_objects++;
|
||||
|
||||
Reference in New Issue
Block a user