summaryrefslogtreecommitdiff
path: root/builtin/read-tree.c
diff options
context:
space:
mode:
authorElijah Newren <newren@gmail.com>2021-09-27 16:33:39 (GMT)
committerJunio C Hamano <gitster@pobox.com>2021-09-27 20:38:37 (GMT)
commitc512d27e787e9eb325731ab6aa7ac126f8cf6126 (patch)
tree2d07b5058c40a43be661004080406769e728a0f5 /builtin/read-tree.c
parent446cc5544a3cb8dbd0ddac5bc5b160a687eb6471 (diff)
downloadgit-c512d27e787e9eb325731ab6aa7ac126f8cf6126.zip
git-c512d27e787e9eb325731ab6aa7ac126f8cf6126.tar.gz
git-c512d27e787e9eb325731ab6aa7ac126f8cf6126.tar.bz2
checkout, read-tree: fix leak of unpack_trees_options.dir
Signed-off-by: Elijah Newren <newren@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/read-tree.c')
-rw-r--r--builtin/read-tree.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/builtin/read-tree.c b/builtin/read-tree.c
index 485e7b0..96102c2 100644
--- a/builtin/read-tree.c
+++ b/builtin/read-tree.c
@@ -250,6 +250,11 @@ int cmd_read_tree(int argc, const char **argv, const char *cmd_prefix)
if (unpack_trees(nr_trees, t, &opts))
return 128;
+ if (opts.dir) {
+ dir_clear(opts.dir);
+ FREE_AND_NULL(opts.dir);
+ }
+
if (opts.debug_unpack || opts.dry_run)
return 0; /* do not write the index out */