@matheusbsbs / matheus-bagliano / commits / 9e2d57a04a
Fork 0

fix same sized delta logic

The code favoring shallower deltas when size is equal was triggered only when previous delta was also cached. There should be no relation between cached deltas and same sized deltas. Signed-off-by: Nicolas Pitre <nico@cam.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>

Nicolas Pitre committed Aug 29, 2007 at 21:17 UTC 9e2d57a04ac42c7450e78668ee7037b35d56f7c3
1 file changed +8 -4
builtin-pack-objects.c
+8 -4
@@ -1389,21 +1389,25 @@ static int try_delta(struct unpacked *trg, struct unpacked *src,
1389 if (!delta_buf)
1390 return 0;
1391
1392 - if (trg_entry->delta_data) {
1392 + if (trg_entry->delta) {
1393 /* Prefer only shallower same-sized deltas. */
1394 if (delta_size == trg_entry->delta_size &&
1395 src->depth + 1 >= trg->depth) {
1396 free(delta_buf);
1397 return 0;
1398 }
1399 - delta_cache_size -= trg_entry->delta_size;
1400 - free(trg_entry->delta_data);
1401 - trg_entry->delta_data = NULL;
1399 }
1400 +
1401 trg_entry->delta = src_entry;
1402 trg_entry->delta_size = delta_size;
1403 trg->depth = src->depth + 1;
1404
1405 + if (trg_entry->delta_data) {
1406 + delta_cache_size -= trg_entry->delta_size;
1407 + free(trg_entry->delta_data);
1408 + trg_entry->delta_data = NULL;
1409 + }
1410 +
1411 if (delta_cacheable(src_size, trg_size, delta_size)) {
1412 trg_entry->delta_data = xrealloc(delta_buf, delta_size);
1413 delta_cache_size += trg_entry->delta_size;