Re: [PATCH 16/30] merge-recursive: Introduce new functions to handle rename logic

On Mon, Nov 13, 2017 at 9:14 PM, Junio C Hamano wrote: > Junio C Hamano writes: > >> Elijah Newren writes: >> >>> +struct rename_info { >>> +struct string_list *head_renames; >>> +struct string_list *merge_renames; >>> +}; >> >>

Re: [PATCH 16/30] merge-recursive: Introduce new functions to handle rename logic

Junio C Hamano writes: > Elijah Newren writes: > >> +struct rename_info { >> +struct string_list *head_renames; >> +struct string_list *merge_renames; >> +}; > > This type is added in order to allow the caller and the helper to > communicate the

Re: [PATCH 16/30] merge-recursive: Introduce new functions to handle rename logic

Elijah Newren writes: > +struct rename_info { > + struct string_list *head_renames; > + struct string_list *merge_renames; > +}; This type is added in order to allow the caller and the helper to communicate the findings in a single logical structure, instead of having

[PATCH 16/30] merge-recursive: Introduce new functions to handle rename logic

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