diff options
| author | Elijah Newren <newren@gmail.com> | 2018-02-14 10:51:51 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-02-14 13:02:52 -0800 |
| commit | 9622f8af8c337f097661a0f476de5b665d74b853 (patch) | |
| tree | be3cb443f4e568750a981f2f6ade8af615fb8752 /commit.c | |
| parent | merge-recursive: introduce new functions to handle rename logic (diff) | |
| download | git-9622f8af8c337f097661a0f476de5b665d74b853.tar.gz git-9622f8af8c337f097661a0f476de5b665d74b853.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