Re: [PATCH v7 16/31] merge-recursive: split out code for determining diff_filepairs

2018-02-02 Thread Elijah Newren
On Fri, Feb 2, 2018 at 4:06 PM, Stefan Beller wrote: > On Tue, Jan 30, 2018 at 3:25 PM, Elijah Newren wrote: >> + ret = malloc(sizeof(struct diff_queue_struct)); > > Please use xmalloc() and while at it, please use "*ret" as the argument > to sizeof. The reason is slightly better maintaina

Re: [PATCH v7 16/31] merge-recursive: split out code for determining diff_filepairs

2018-02-02 Thread Stefan Beller
On Tue, Jan 30, 2018 at 3:25 PM, Elijah Newren wrote: > @@ -1354,10 +1345,43 @@ static struct string_list *get_renames(struct > merge_options *o, > diffcore_std(&opts); > if (opts.needed_rename_limit > o->needed_rename_limit) > o->needed_rename_limit = opts.needed