merge_trees(): ensure that the callers release output buffer

diff --git a/builtin/checkout.c b/builtin/checkout.c
index 07dea3bc814ba26edd13a0e3ae73b3298958c3e9..8d852d458514ca8d2e9553bec6a818b140b0e478 100644 (file)
--- a/builtin/checkout.c
+++ b/builtin/checkout.c
@@ -573,6 +573,7 @@ static int merge_working_tree(const struct checkout_opts *opts,
                                exit(128);
                        ret = reset_tree(new->commit->tree, opts, 0,
                                         writeout_error);
+                       strbuf_release(&o.obuf);
                        if (ret)
                                return ret;
                }