Re: [PATCH 17/30] merge-recursive: Fix leaks of allocated renames and diff_filepairs

2017-11-13 Thread Junio C Hamano
Elijah Newren writes: > get_renames() has always zero'ed out diff_queued_diff.nr while only > manually free'ing diff_filepairs that did not correspond to renames. > Further, it allocated struct renames that were tucked away in the > return string_list. Make sure all of these are deallocated when

[PATCH 17/30] merge-recursive: Fix leaks of allocated renames and diff_filepairs

2017-11-10 Thread Elijah Newren
get_renames() has always zero'ed out diff_queued_diff.nr while only manually free'ing diff_filepairs that did not correspond to renames. Further, it allocated struct renames that were tucked away in the return string_list. Make sure all of these are deallocated when we are done with them. Signed-