]> git.ipfire.org Git - thirdparty/git.git/commit - merge-recursive.c
merge-recursive: remove useless parameter in merge_trees()
authorElijah Newren <newren@gmail.com>
Sat, 17 Aug 2019 18:41:30 +0000 (11:41 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 19 Aug 2019 17:08:03 +0000 (10:08 -0700)
commitb4db8a2b768742f4f43d4a6cdb1db39c2ffc9f7f
treeed09adf5db7d6e254b5fb76172426f33336b0b15
parent98a1d3d88895a1cbc01b88627776bb4e2bfd6b84
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 <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
builtin/checkout.c
merge-recursive.c
merge-recursive.h
sequencer.c