summaryrefslogtreecommitdiff
path: root/builtin-pack-objects.c
diff options
context:
space:
mode:
authorNicolas Pitre <nico@cam.org>2006-09-27 19:42:16 (GMT)
committerJunio C Hamano <junkio@cox.net>2006-09-27 20:32:54 (GMT)
commita2700696995651322796e04092bf4a4bfed31b88 (patch)
tree833c0e97098aaf23feffdf70c23b207ad7330196 /builtin-pack-objects.c
parentf130446920b550a69716346fb9a9947c04fc7f90 (diff)
downloadgit-a2700696995651322796e04092bf4a4bfed31b88.zip
git-a2700696995651322796e04092bf4a4bfed31b88.tar.gz
git-a2700696995651322796e04092bf4a4bfed31b88.tar.bz2
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>
Diffstat (limited to 'builtin-pack-objects.c')
-rw-r--r--builtin-pack-objects.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin-pack-objects.c b/builtin-pack-objects.c
index 16e98f3..ee5f031 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