kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

merge-recursive: do not report the resulting tree object name 

It is not available in the outermost merge, and it is only
useful for debugging merge-recursive in the inner merges.

Sergey Vlasov noticed that the old code accesses an
uninitialized location.

Signed-off-by: Junio C Hamano <junkio@cox.net>
maint
Junio C Hamano 2007-01-12 12:05:58 -08:00
parent 397dfe67c7
commit 1cf716a219
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
merge-recursive.c
View File

@ -1066,13 +1066,10 @@ static int merge_trees(struct tree *head,
path_list_clear(re_head, 0); path_list_clear(re_head, 0);
path_list_clear(entries, 1); path_list_clear(entries, 1);


} else {
clean = 1;
printf("merging of trees %s and %s resulted in %s\n",
sha1_to_hex(head->object.sha1),
sha1_to_hex(merge->object.sha1),
sha1_to_hex((*result)->object.sha1));
} }
else
clean = 1;

if (index_only) if (index_only)
*result = git_write_tree(); *result = git_write_tree();