pack-objects: Prefer shallower deltas if the size is equal
Change "try_delta" so that if it finds a delta that has the same size but shallower depth than the existing delta, it will prefer the shallower one. This makes certain delta trees vastly less deep. Signed-off-by: Brian Downing <bdowning@lavos.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Brian Downing committed
Jul 8, 2007 at 23:45 UTC
848d732c10616269886d0b9c82e434b65ffc33f0
1 file changed
+7
-1
builtin-pack-objects.c
+7
-1
@@ -1337,7 +1337,7 @@ static int try_delta(struct unpacked *trg, struct unpacked *src,
1337
if (max_size == 0)
1338
return 0;
1339
if (trg_entry->delta && trg_entry->delta_size <= max_size)
1340
- max_size = trg_entry->delta_size-1;
1340
+ max_size = trg_entry->delta_size;
1341
src_size = src_entry->size;
1342
sizediff = src_size < trg_size ? trg_size - src_size : 0;
1343
if (sizediff >= max_size)
@@ -1371,6 +1371,12 @@ static int try_delta(struct unpacked *trg, struct unpacked *src,
1371
return 0;
1372
1373
if (trg_entry->delta_data) {
1374
+ /* Prefer only shallower same-sized deltas. */
1375
+ if (delta_size == trg_entry->delta_size &&
1376
+ src_entry->depth + 1 >= trg_entry->depth) {
1377
+ free(delta_buf);
1378
+ return 0;
1379
+ }
1380
delta_cache_size -= trg_entry->delta_size;
1381
free(trg_entry->delta_data);
1382
}