Merge branch 'js/maint-daemon' into maint

[git.git] / fast-import.c

diff --git a/fast-import.c b/fast-import.c
index a523b171e22f83d6a656b372cf20afe52d27d1b2..9b71ccc479352c6a37b9b9652f1cb1793fdbb01b 100644 (file)
--- a/fast-import.c
+++ b/fast-import.c
@@ -1204,6 +1204,8 @@ static void load_tree(struct tree_entry *root)
                        die("Not a tree: %s", sha1_to_hex(sha1));
                t->delta_depth = myoe->depth;
                buf = gfi_unpack_entry(myoe, &size);
+               if (!buf)
+                       die("Can't load tree %s", sha1_to_hex(sha1));
        } else {
                enum object_type type;
                buf = read_sha1_file(sha1, &type, &size);