From: Nicolas Pitre <nico@cam.org>
Date: Thu, 30 Aug 2007 01:17:17 +0000 (-0400)
Subject: fix same sized delta logic
X-Git-Tag: v1.5.3~21
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/9e2d57a04ac42c7450e78668ee7037b35d56f7c3

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>
---

diff --git a/builtin-pack-objects.c b/builtin-pack-objects.c
index 9b3ef94c4c..12509faa77 100644
--- a/builtin-pack-objects.c
+++ b/builtin-pack-objects.c
@@ -1389,21 +1389,25 @@ static int try_delta(struct unpacked *trg, struct unpacked *src,
 	if (!delta_buf)
 		return 0;
 
-	if (trg_entry->delta_data) {
+	if (trg_entry->delta) {
 		/* Prefer only shallower same-sized deltas. */
 		if (delta_size == trg_entry->delta_size &&
 		    src->depth + 1 >= trg->depth) {
 			free(delta_buf);
 			return 0;
 		}
-		delta_cache_size -= trg_entry->delta_size;
-		free(trg_entry->delta_data);
-		trg_entry->delta_data = NULL;
 	}
+
 	trg_entry->delta = src_entry;
 	trg_entry->delta_size = delta_size;
 	trg->depth = src->depth + 1;
 
+	if (trg_entry->delta_data) {
+		delta_cache_size -= trg_entry->delta_size;
+		free(trg_entry->delta_data);
+		trg_entry->delta_data = NULL;
+	}
+
 	if (delta_cacheable(src_size, trg_size, delta_size)) {
 		trg_entry->delta_data = xrealloc(delta_buf, delta_size);
 		delta_cache_size += trg_entry->delta_size;