From: Junio C Hamano <junkio@cox.net>
Date: Tue, 16 May 2006 21:50:26 +0000 (-0700)
Subject: Merge branch 'np/pack' into next
X-Git-Tag: v1.4.1-rc1~99
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/00dd7422db1e3e0c60d41c2a2299709f90bcf3f6?hp=70bde2bc310e257bd57ed578ac78af1d31437ea6

Merge branch 'np/pack' into next

* np/pack:
improve depth heuristic for maximum delta size
---

diff --git a/pack-objects.c b/pack-objects.c
index 566a2a2349..77284cfdba 100644
--- a/pack-objects.c
+++ b/pack-objects.c
@@ -1036,9 +1036,12 @@ static int try_delta(struct unpacked *trg, struct unpacked *src,
 	if (src_entry->depth >= max_depth)
 		return 0;
 
-	/* Now some size filtering euristics. */
+	/* Now some size filtering heuristics. */
 	size = trg_entry->size;
-	max_size = (size/2 - 20) / (src_entry->depth + 1);
+	max_size = size/2 - 20;
+	max_size = max_size * (max_depth - src_entry->depth) / max_depth;
+	if (max_size == 0)
+		return 0;
 	if (trg_entry->delta && trg_entry->delta_size <= max_size)
 		max_size = trg_entry->delta_size-1;
 	src_size = src_entry->size;