diff options
| author | Elijah Newren <newren@gmail.com> | 2018-04-19 10:58:01 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-04-20 10:44:15 +0900 |
| commit | 9cfee25a823d972250409b5c8bdfd91d1cdf7edb (patch) | |
| tree | c580afccd831a82c31b8a2fb0a3500ac9847f4c2 /commit.c | |
| parent | merge-recursive: introduce new functions to handle rename logic (diff) | |
| download | git-9cfee25a823d972250409b5c8bdfd91d1cdf7edb.tar.gz git-9cfee25a823d972250409b5c8bdfd91d1cdf7edb.zip | |
merge-recursive: fix leaks of allocated renames and diff_filepairs
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.
Reviewed-by: Stefan Beller <sbeller@google.com>
Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'commit.c')
0 files changed, 0 insertions, 0 deletions