From mboxrd@z Thu Jan 1 00:00:00 1970 From: skimo@liacs.nl Subject: [PATCH 15/16] git-read-tree: treat null commit as empty tree Date: Fri, 18 May 2007 21:25:04 +0200 Message-ID: <11795163072872-git-send-email-skimo@liacs.nl> References: <11795163053812-git-send-email-skimo@liacs.nl> To: git@vger.kernel.org, Junio C Hamano X-From: git-owner@vger.kernel.org Fri May 18 21:26:17 2007 Return-path: Envelope-to: gcvg-git@gmane.org Received: from vger.kernel.org ([209.132.176.167]) by lo.gmane.org with esmtp (Exim 4.50) id 1Hp85g-0002Yo-Us for gcvg-git@gmane.org; Fri, 18 May 2007 21:26:17 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757816AbXERTZn (ORCPT ); Fri, 18 May 2007 15:25:43 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1758030AbXERTZm (ORCPT ); Fri, 18 May 2007 15:25:42 -0400 Received: from rhodium.liacs.nl ([132.229.131.16]:55771 "EHLO rhodium.liacs.nl" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1758047AbXERTZ1 (ORCPT ); Fri, 18 May 2007 15:25:27 -0400 Received: from pc117b.liacs.nl (pc117b.liacs.nl [132.229.129.143]) by rhodium.liacs.nl (8.13.0/8.13.0/LIACS 1.4) with ESMTP id l4IJPIfO005214; Fri, 18 May 2007 21:25:23 +0200 Received: by pc117b.liacs.nl (Postfix, from userid 17122) id C65FE7DDAE; Fri, 18 May 2007 21:25:07 +0200 (CEST) X-Mailer: git-send-email 1.5.0.rc3.1762.g0934 In-Reply-To: <11795163053812-git-send-email-skimo@liacs.nl> Sender: git-owner@vger.kernel.org Precedence: bulk X-Mailing-List: git@vger.kernel.org Archived-At: From: Sven Verdoolaege --- 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 e979bc5..30c2a49 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.783.gc7476-dirty