From b4db8a2b768742f4f43d4a6cdb1db39c2ffc9f7f Mon Sep 17 00:00:00 2001 From: Elijah Newren Date: Sat, 17 Aug 2019 11:41:30 -0700 Subject: merge-recursive: remove useless parameter in merge_trees() 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 Signed-off-by: Junio C Hamano --- merge-recursive.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'merge-recursive.c') diff --git a/merge-recursive.c b/merge-recursive.c index 2a254d5563..4ce783dbfa 100644 --- a/merge-recursive.c +++ b/merge-recursive.c @@ -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; -- cgit v1.2.3