mirror of
https://github.com/git/git
synced 2024-08-27 19:49:21 +00:00
fast-import: check return value from unpack_entry()
If the tree object we have asked for is deltafied in the packfile and the delta did not apply correctly or was not able to be decompressed from the packfile then we can get back NULL instead of the tree data. This is (part of) the reason why read_sha1_file() can return NULL, so we need to also handle it the same way. Signed-off-by: Shawn O. Pearce <spearce@spearce.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
parent
df93e33c8b
commit
e8b32e0610
|
@ -1204,6 +1204,8 @@ static void load_tree(struct tree_entry *root)
|
||||||
die("Not a tree: %s", sha1_to_hex(sha1));
|
die("Not a tree: %s", sha1_to_hex(sha1));
|
||||||
t->delta_depth = myoe->depth;
|
t->delta_depth = myoe->depth;
|
||||||
buf = gfi_unpack_entry(myoe, &size);
|
buf = gfi_unpack_entry(myoe, &size);
|
||||||
|
if (!buf)
|
||||||
|
die("Can't load tree %s", sha1_to_hex(sha1));
|
||||||
} else {
|
} else {
|
||||||
enum object_type type;
|
enum object_type type;
|
||||||
buf = read_sha1_file(sha1, &type, &size);
|
buf = read_sha1_file(sha1, &type, &size);
|
||||||
|
|
Loading…
Reference in a new issue