Skip to content

Commit

Permalink
tree-diff: convert diff_root_tree_sha1() to just call diff_tree_sha1 …
Browse files Browse the repository at this point in the history
…with old=NULL

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 <kirr@mns.spb.ru>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
  • Loading branch information
Kirill Smelkov authored and gitster committed Feb 5, 2014
1 parent 7913032 commit 0b707c3
Showing 1 changed file with 1 addition and 14 deletions.
15 changes: 1 addition & 14 deletions tree-diff.c
Original file line number Diff line number Diff line change
Expand Up @@ -311,18 +311,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);
}

0 comments on commit 0b707c3

Please sign in to comment.