Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.kernel.org/pub/scm/git/git.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2022-12-14 09:55:46 +0300
committerJunio C Hamano <gitster@pobox.com>2022-12-14 09:55:46 +0300
commit9ea1378d046d764642718f1b070689072bde4601 (patch)
treeb15bce1d35006e79f91cc2a985e7b69a77e0fd3d /builtin/merge.c
parent7576e512cec7630ba2a35af33fa00868cedb8e18 (diff)
parentac95f5d36adb42980064587fd7910fa275ff853e (diff)
Merge branch 'ab/various-leak-fixes'
Various leak fixes. * ab/various-leak-fixes: built-ins: use free() not UNLEAK() if trivial, rm dead code revert: fix parse_options_concat() leak cherry-pick: free "struct replay_opts" members rebase: don't leak on "--abort" connected.c: free the "struct packed_git" sequencer.c: fix "opts->strategy" leak in read_strategy_opts() ls-files: fix a --with-tree memory leak revision API: call graph_clear() in release_revisions() unpack-file: fix ancient leak in create_temp_file() built-ins & libs & helpers: add/move destructors, fix leaks dir.c: free "ident" and "exclude_per_dir" in "struct untracked_cache" read-cache.c: clear and free "sparse_checkout_patterns" commit: discard partial cache before (re-)reading it {reset,merge}: call discard_index() before returning tests: mark tests as passing with SANITIZE=leak
Diffstat (limited to 'builtin/merge.c')
-rw-r--r--builtin/merge.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/builtin/merge.c b/builtin/merge.c
index dd474371a2..ecccd5e911 100644
--- a/builtin/merge.c
+++ b/builtin/merge.c
@@ -1789,5 +1789,6 @@ done:
}
strbuf_release(&buf);
free(branch_to_free);
+ discard_index(&the_index);
return ret;
}