diff options
| author | Junio C Hamano <gitster@pobox.com> | 2021-10-25 23:06:59 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2021-10-25 23:06:59 (GMT) |
| commit | 54c4f8ce52f20ea1be99c780ce19867964f430b7 (patch) | |
| tree | 7e3f9f4a7c804821f32750f7d7d5cd28bf71856a /builtin/merge.c | |
| parent | 5a4f8381b68b39e1a39e78039ddb2c415927cb12 (diff) | |
| parent | 465028e0e25518bfff8b83057775cb6b2df2aade (diff) | |
| download | git-54c4f8ce52f20ea1be99c780ce19867964f430b7.zip git-54c4f8ce52f20ea1be99c780ce19867964f430b7.tar.gz git-54c4f8ce52f20ea1be99c780ce19867964f430b7.tar.bz2 | |
Merge branch 'ab/mark-leak-free-tests-more'
Bunch of tests are marked as "passing leak check".
* ab/mark-leak-free-tests-more:
merge: add missing strbuf_release()
ls-files: add missing string_list_clear()
ls-files: fix a trivial dir_clear() leak
tests: fix test-oid-array leak, test in SANITIZE=leak
tests: fix a memory leak in test-oidtree.c
tests: fix a memory leak in test-parse-options.c
tests: fix a memory leak in test-prio-queue.c
Diffstat (limited to 'builtin/merge.c')
| -rw-r--r-- | builtin/merge.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/builtin/merge.c b/builtin/merge.c index cc4a910..ea3112e 100644 --- a/builtin/merge.c +++ b/builtin/merge.c @@ -1578,6 +1578,7 @@ int cmd_merge(int argc, const char **argv, const char *prefix) finish(head_commit, remoteheads, &commit->object.oid, msg.buf); remove_merge_branch_state(the_repository); + strbuf_release(&msg); goto done; } else if (!remoteheads->next && common->next) ; @@ -1748,6 +1749,7 @@ int cmd_merge(int argc, const char **argv, const char *prefix) ret = suggest_conflicts(); done: + strbuf_release(&buf); free(branch_to_free); return ret; } |