]> git.ipfire.org Git - thirdparty/git.git/commit - merge-recursive.c
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 3992ff0) | patch
merge-recursive: split out code for determining diff_filepairs
authorElijah Newren <newren@gmail.com>
Thu, 19 Apr 2018 17:58:03 +0000 (10:58 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 20 Apr 2018 01:44:15 +0000 (10:44 +0900)
commite5257b2a0d72010cea8150a520347a206394efd0
treea78db94a9b5cce455e6209c4ddb05dcfefda66bdtree | snapshot
parent3992ff0c4caf925373b61aa17ab507207bf7e645commit | diff
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 diff | blob | blame | history
Unnamed repository; edit this file 'description' to name the repository.