From: Nicolas Pitre <nico@fluxnic.net>
Date: Wed, 17 Feb 2010 19:05:56 +0000 (-0500)
Subject: fast-import: use the diff_delta() max_delta_size argument
X-Git-Tag: v1.7.0.2~21^2
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=b500d5e11ea67d29dd7be622f65571d611d6e9a3;p=git-core%2Fgit.git

fast-import: use the diff_delta() max_delta_size argument

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>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

diff --git a/fast-import.c b/fast-import.c
index 7fc98620b..74f08bd55 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;