diff options
| author | Patrick Steinhardt <ps@pks.im> | 2024-06-11 11:21:06 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2024-06-11 22:15:07 +0200 |
| commit | 77241a6b5e3aadbc697632600e7e187ae94c4ca6 (patch) | |
| tree | f0dec6279a729166fdaa409b0c4145f1358a9dc2 /merge-recursive.c | |
| parent | sequencer: fix memory leaks in `make_script_with_merges()` (diff) | |
| download | git-77241a6b5e3aadbc697632600e7e187ae94c4ca6.tar.xz git-77241a6b5e3aadbc697632600e7e187ae94c4ca6.zip | |
builtin/merge: fix leaking `struct cmdnames` in `get_strategy()`
In "builtin/merge.c" we use the helper infrastructure to figure out what
merge strategies there are. We never free contents of the `cmdnames`
structures though and thus leak their memory.
Fix this by exposing the already existing `clean_cmdnames()` function to
release their memory. As this name isn't quite idiomatic, rename it to
`cmdnames_release()` while at it.
Signed-off-by: Patrick Steinhardt <ps@pks.im>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'merge-recursive.c')
0 files changed, 0 insertions, 0 deletions