[PATCH 6/6] fast-import: use the diff_delta() max_delta_size argument

From: Nicolas Pitre <nico@fluxnic.net>
Date: Feb 17, 2010, 19:05 UTC
Message-ID: <1266433556-1987-7-git-send-email-nico@fluxnic.net>
In-Reply-To: <1266433556-1987-1-git-send-email-nico@fluxnic.net>

This let diff_delta() abort early if it is going to bust the given size limit. Also, only objects larger than 20 bytes are considered as objects smaller than that are most certainly going to produce larger deltas than the original object due to the additional headers.

Signed-off-by: Nicolas Pitre <nico@fluxnic.net>
---
 fast-import.c |    8 ++------
 1 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/fast-import.c b/fast-import.c
index 7fc9862..74f08bd 100644
--- a/fast-import.c
+++ b/fast-import.c
@@ -1041,14 +1041,10 @@ static int store_object(
 		return 1;
 	}
 
-	if (last && last->data.buf && last->depth < max_depth) {
+	if (last && last->data.buf && last->depth < max_depth && dat->len > 20) {
 		delta = diff_delta(last->data.buf, last->data.len,
 			dat->buf, dat->len,
-			&deltalen, 0);
-		if (delta && deltalen >= dat->len) {
-			free(delta);
-			delta = NULL;
-		}
+			&deltalen, dat->len - 20);
 	} else
 		delta = NULL;

-- 
1.7.0.23.gf5ef4