diff options
| author | Patrick Steinhardt <ps@pks.im> | 2024-06-11 11:19:40 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2024-06-11 13:15:05 -0700 |
| commit | 3d31d382557527bf945a088931e3e28a717cc547 (patch) | |
| tree | 434ef0510e1674429beecd9b87274b0a3083ed50 /builtin/commit-tree.c | |
| parent | afb0653d2373dc72ad4a9c89b7d17b660d194f04 (diff) | |
merge-recursive: fix leaking rename conflict info
When computing rename conflicts in our recursive merge algorithm we set
up `struct rename_conflict_info`s to track that information. We never
free those data structures though and thus leak memory.
We need to be a bit more careful here though because the same rename
conflict info can be assigned to multiple structures. Accommodate for
this by introducing a `rename_conflict_info_owned` bit that we can use
to steer whether or not the rename conflict info shall be free'd.
Signed-off-by: Patrick Steinhardt <ps@pks.im>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/commit-tree.c')
0 files changed, 0 insertions, 0 deletions