[PATCH 11/15] git-read-tree: treat null commit as empty tree
From: <hidden>
Date: 2016-06-15 22:43:11
Subsystem:
the rest · Maintainer:
Linus Torvalds
From: Sven Verdoolaege <redacted> --- builtin-read-tree.c | 9 ++++++--- unpack-trees.c | 3 +++ 2 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/builtin-read-tree.c b/builtin-read-tree.c
index 929dd95..b9fcff7 100644
--- a/builtin-read-tree.c
+++ b/builtin-read-tree.c@@ -17,9 +17,12 @@ static struct object_list *trees; static int list_tree(unsigned char *sha1) { - struct tree *tree = parse_tree_indirect(sha1); - if (!tree) - return -1; + struct tree *tree = NULL; + if (!is_null_sha1(sha1)) { + tree = parse_tree_indirect(sha1); + if (!tree) + return -1; + } object_list_append(&tree->object, &trees); return 0; }
diff --git a/unpack-trees.c b/unpack-trees.c
index f3fe2dd..3dadebb 100644
--- a/unpack-trees.c
+++ b/unpack-trees.c@@ -26,6 +26,9 @@ static struct tree_entry_list *create_tree_entry_list(struct tree *tree) struct tree_entry_list *ret = NULL; struct tree_entry_list **list_p = &ret; + if (!tree) + return ret; + if (!tree->object.parsed) parse_tree(tree);
--
1.5.2.rc3.815.g8fc2