From: Kirill Smelkov Date: Wed, 05 Feb 2014 16:57:10 GMT Subject: [PATCH 2/4] tree-diff: convert diff_root_tree_sha1() to just call diff_tree_sha1 with old=NULL Message-ID: In-Reply-To: Now since diff_tree_sha1 understands NULL for both old and new, we could indicate an empty tree for root commit by providing just NULL for old sha1. Signed-off-by: Kirill Smelkov --- tree-diff.c | 15 +-------------- 1 file changed, 1 insertion(+), 14 deletions(-) diff --git a/tree-diff.c b/tree-diff.c index f438478..6d82a3f 100644 --- a/tree-diff.c +++ b/tree-diff.c @@ -304,18 +304,5 @@ int diff_tree_sha1(const unsigned char *old, const unsigned char *new, const cha int diff_root_tree_sha1(const unsigned char *new, const char *base, struct diff_options *opt) { - int retval; - void *tree; - unsigned long size; - struct tree_desc empty, real; - - tree = read_object_with_reference(new, tree_type, &size, NULL); - if (!tree) - die("unable to read root tree (%s)", sha1_to_hex(new)); - init_tree_desc(&real, tree, size); - - init_tree_desc(&empty, "", 0); - retval = diff_tree(&empty, &real, base, opt); - free(tree); - return retval; + return diff_tree_sha1(NULL, new, base, opt); } -- 1.9.rc1.181.g641f458