development/git
development/git
1
0
Fork 0
mirror of https://github.com/git/git synced 2024-08-25 02:35:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

tree-diff: allow diff_tree_sha1 to accept NULL sha1

Browse source 
which would mean that corresponding tree - old or new - is empty.

As followup patches will show, that functionality was already needed in
several places of Git codebase, but there, we were preparing empty
tree_desc objects by hand, with some code duplication.

For handling sha1 = NULL case, let's reuse fill_tree_descriptor() which
returns just empty tree_desc in that case.

Signed-off-by: Kirill Smelkov <kirr@mns.spb.ru>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Kirill Smelkov 2014-02-05 20:57:09 +04:00 committed by Junio C Hamano
parent be961c292f
commit 791303284c
1 changed files with 4 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
tree-diff.c
View file

@ -294,14 +294,10 @@ int diff_tree_sha1(const unsigned char *old, const unsigned char *new, const cha
unsigned long size1, size2; unsigned long size1, size2;
int retval; int retval;
tree1 = read_object_with_reference(old, tree_type, &size1, NULL); tree1 = fill_tree_descriptor(&t1, old);
if (!tree1) tree2 = fill_tree_descriptor(&t2, new);
die("unable to read source tree (%s)", sha1_to_hex(old)); size1 = t1.size;
tree2 = read_object_with_reference(new, tree_type, &size2, NULL); size2 = t2.size;
if (!tree2)
die("unable to read destination tree (%s)", sha1_to_hex(new));
init_tree_desc(&t1, tree1, size1);
init_tree_desc(&t2, tree2, size2);
retval = diff_tree(&t1, &t2, base, opt); retval = diff_tree(&t1, &t2, base, opt);
if (!*base && DIFF_OPT_TST(opt, FOLLOW_RENAMES) && diff_might_be_rename()) { if (!*base && DIFF_OPT_TST(opt, FOLLOW_RENAMES) && diff_might_be_rename()) {
init_tree_desc(&t1, tree1, size1); init_tree_desc(&t1, tree1, size1);