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
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
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.
Signed-off-by: Elijah Newren
---
merge-recursive.c | 86
3 matches
Mail list logo
