Merge branch 'np/pack' into next

* np/pack:
  improve depth heuristic for maximum delta size
This commit is contained in:
Junio C Hamano 2006-05-16 14:50:26 -07:00
commit 00dd7422db

View File

@ -1036,9 +1036,12 @@ static int try_delta(struct unpacked *trg, struct unpacked *src,
if (src_entry->depth >= max_depth)
return 0;
/* Now some size filtering euristics. */
/* Now some size filtering heuristics. */
size = trg_entry->size;
max_size = (size/2 - 20) / (src_entry->depth + 1);
max_size = size/2 - 20;
max_size = max_size * (max_depth - src_entry->depth) / max_depth;
if (max_size == 0)
return 0;
if (trg_entry->delta && trg_entry->delta_size <= max_size)
max_size = trg_entry->delta_size-1;
src_size = src_entry->size;