Re: [PATCH v7 15/31] merge-recursive: make !o->detect_rename codepath more obvious

2018-02-02 Thread Stefan Beller
On Tue, Jan 30, 2018 at 3:25 PM, Elijah Newren wrote: > Previously, if !o->detect_rename then get_renames() would return an > empty string_list, and then process_renames() would have nothing to > iterate over. It seems more straightforward to simply avoid calling > either function in that case. >

[PATCH v7 15/31] merge-recursive: make !o->detect_rename codepath more obvious

2018-01-30 Thread Elijah Newren
Previously, if !o->detect_rename then get_renames() would return an empty string_list, and then process_renames() would have nothing to iterate over. It seems more straightforward to simply avoid calling either function in that case. Signed-off-by: Elijah Newren --- merge-recursive.c | 11 +