From: Nicolas Pitre <nico@cam.org>
Date: Wed, 27 Sep 2006 19:42:16 +0000 (-0400)
Subject: allow delta data reuse even if base object is a preferred base
X-Git-Tag: v1.4.4-rc1~77^2~4
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=a2700696995651322796e04092bf4a4bfed31b88;p=git.git

allow delta data reuse even if base object is a preferred base

Signed-off-by: Nicolas Pitre <nico@cam.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
---

diff --git a/builtin-pack-objects.c b/builtin-pack-objects.c
index 16e98f3f3..ee5f031bc 100644
--- a/builtin-pack-objects.c
+++ b/builtin-pack-objects.c
@@ -988,7 +988,7 @@ static void check_object(struct object_entry *entry)
 		unuse_packed_git(p);
 		entry->in_pack_header_size = used;
 
-		if (base_entry && !base_entry->preferred_base) {
+		if (base_entry) {
 
 			/* Depth value does not matter - find_deltas()
 			 * will never consider reused delta as the