From: Nicolas Pitre <nico@cam.org>
Date: Fri, 2 May 2008 19:11:51 +0000 (-0400)
Subject: pack-objects: fix early eviction for max depth delta objects
X-Git-Tag: v1.5.6-rc0~33^2
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=70baf5d41a933c7972375ae2583aad8c8b92633f;p=git.git

pack-objects: fix early eviction for max depth delta objects

The 'depth' variable doesn't reflect the actual maximum depth used
when other objects already depend on the current one.

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 4a0c9c907..e20851e1c 100644
--- a/builtin-pack-objects.c
+++ b/builtin-pack-objects.c
@@ -1486,7 +1486,7 @@ static void find_deltas(struct object_entry **list, unsigned *list_size,
 		 * depth, leaving it in the window is pointless.  we
 		 * should evict it first.
 		 */
-		if (entry->delta && depth <= n->depth)
+		if (entry->delta && max_depth <= n->depth)
 			continue;
 
 		/*