]> git.ipfire.org Git - thirdparty/git.git/commit
merge-recursive: split out code for determining diff_filepairs
authorElijah Newren <newren@gmail.com>
Wed, 14 Feb 2018 18:51:53 +0000 (10:51 -0800)
committerJunio C Hamano <gitster@pobox.com>
Wed, 14 Feb 2018 21:02:52 +0000 (13:02 -0800)
commit3f646871a31d95576e11e74fc5db2e3ed2380b52
tree951c273bac485d224761ea6805d6137a30c517e0
parente7f04a3aafe3fa9bc911e3a71e03e9e7cc8b18ba
merge-recursive: split out code for determining diff_filepairs

Create a new function, get_diffpairs() to compute the diff_filepairs
between two trees.  While these are currently only used in
get_renames(), I want them to be available to some new functions.  No
actual logic changes yet.

Reviewed-by: Stefan Beller <sbeller@google.com>
Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
merge-recursive.c