mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

merge-recursive: remove useless parameter in merge_trees()

Browse Source 
merge_trees() took a results parameter that would only be written when
opt->call_depth was positive, which is never the case now that
merge_trees_internal() has been split from merge_trees().  Remove the
misleading and unused parameter from merge_trees().

While at it, add some comments explaining how the output of
merge_trees() and merge_recursive() differ.

Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Elijah Newren
2019-08-17 11:41:30 -07:00
committed by Junio C Hamano
parent 98a1d3d888
commit b4db8a2b76
4 changed files with 22 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
merge-recursive.c
View File

@ -3623,16 +3623,16 @@ static void merge_finalize(struct merge_options *opt)
int merge_trees(struct merge_options *opt,
struct tree *head,
struct tree *merge,
struct tree *common,
struct tree **result)
struct tree *common)
{
int clean;
struct tree *ignored;
assert(opt->ancestor != NULL);
if (merge_start(opt, head))
return -1;
clean = merge_trees_internal(opt, head, merge, common, result);
clean = merge_trees_internal(opt, head, merge, common, &ignored);
merge_finalize(opt);
return clean;