Re: [PATCH v7 13/31] merge-recursive: introduce new functions to handle rename logic

2018-02-02 Thread Stefan Beller
On Tue, Jan 30, 2018 at 3:25 PM, Elijah Newren wrote: > The amount of logic in merge_trees() relative to renames was just a few > lines, but split it out into new handle_renames() and cleanup_renames() > functions to prepare for additional logic to be added to each. No code or > logic changes, ju

[PATCH v7 13/31] merge-recursive: introduce new functions to handle rename logic

2018-01-30 Thread Elijah Newren
The amount of logic in merge_trees() relative to renames was just a few lines, but split it out into new handle_renames() and cleanup_renames() functions to prepare for additional logic to be added to each. No code or logic changes, just a new place to put stuff for when the rename detection gains