[PATCH 05/17] fixup! index-pack: support completing thin packs v4

From: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Date: Sep 21, 2013, 13:57 UTC
Message-ID: <1379771883-10278-6-git-send-email-pclouds@gmail.com>
In-Reply-To: <1379771883-10278-1-git-send-email-pclouds@gmail.com>

!is_delta_tree() is not correct because the tree may have been resolved in by find_unresolved_deltas() in the previous iteration of this loop. Check for entry->idx.sha1 instead, that must be non-null when we resolve the object.

Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
---
 builtin/index-pack.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/builtin/index-pack.c b/builtin/index-pack.c
index fbf97f0..db885b1 100644
--- a/builtin/index-pack.c
+++ b/builtin/index-pack.c
@@ -1783,7 +1783,7 @@ static void fix_unresolved_deltas(struct sha1file *f, int nr_unresolved)
 		enum object_type type;
 		struct base_data *base_obj = alloc_base_data();
 
-		if (obj->real_type != OBJ_REF_DELTA && !is_delta_tree(obj))
+		if (!is_null_sha1(obj->idx.sha1))
 			continue;
 		base_obj->data = read_sha1_file(d->base.sha1, &type, &base_obj->size);
 		if (!base_obj->data)

-- 
1.8.2.83.gc99314b