diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2018-05-30 21:51:29 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-05-30 21:51:29 +0900 |
| commit | e47dbece39712567a36a096010c5c1223119f7e3 (patch) | |
| tree | aced74e797a0c37931e367574bdd60cbfb63e0f4 /builtin | |
| parent | Merge branch 'bc/hash-independent-tests' (diff) | |
| parent | unpack_trees_options: free messages when done (diff) | |
| download | tgif-e47dbece39712567a36a096010c5c1223119f7e3.tar.xz | |
Merge branch 'ma/unpack-trees-free-msgs'
Leak plugging.
* ma/unpack-trees-free-msgs:
unpack_trees_options: free messages when done
argv-array: return the pushed string from argv_push*()
merge-recursive: provide pair of `unpack_trees_{start,finish}()`
merge: setup `opts` later in `checkout_fast_forward()`
Diffstat (limited to 'builtin')
| -rw-r--r-- | builtin/checkout.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/builtin/checkout.c b/builtin/checkout.c index 2b3b768eff..2e1d2376d2 100644 --- a/builtin/checkout.c +++ b/builtin/checkout.c @@ -527,6 +527,7 @@ static int merge_working_tree(const struct checkout_opts *opts, init_tree_desc(&trees[1], tree->buffer, tree->size); ret = unpack_trees(2, trees, &topts); + clear_unpack_trees_porcelain(&topts); if (ret == -1) { /* * Unpack couldn't do a trivial merge; either |