From: Elijah Newren Date: Wed, 19 Sep 2018 16:14:32 +0000 (-0700) Subject: merge-recursive: avoid wrapper function when unnecessary and wasteful X-Git-Tag: v2.20.0-rc0~187^2~2 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=75f3fa79c39a39fd6ca5e4bae73df4073ca97bd4;p=thirdparty%2Fgit.git merge-recursive: avoid wrapper function when unnecessary and wasteful merge_file_one() is a convenience function taking a bunch of oids and modes, combining each pair into a diff_filespec, and then calling merge_file_1(). When we already start with diff_filespec's, we can just call merge_file_1() directly instead of splitting out the oids and modes for the wrapper to recombine into what we already had. Signed-off-by: Elijah Newren Signed-off-by: Junio C Hamano --- diff --git a/merge-recursive.c b/merge-recursive.c index 99a7ac5ec7..9e4e3da672 100644 --- a/merge-recursive.c +++ b/merge-recursive.c @@ -1630,10 +1630,7 @@ static int handle_rename_rename_1to2(struct merge_options *o, struct merge_file_info mfi; struct diff_filespec other; struct diff_filespec *add; - if (merge_file_one(o, one->path, - &one->oid, one->mode, - &a->oid, a->mode, - &b->oid, b->mode, + if (merge_file_1(o, one, a, b, one->path, ci->branch1, ci->branch2, &mfi)) return -1;