merge_trees(): ensure that the callers release output buffer

diff --git a/sequencer.c b/sequencer.c
index 286a4358520429bc8433eaf192beca9690c71ade..ec50519df92eb50f74db8e7db05f35d0ebb913b2 100644 (file)
--- a/sequencer.c
+++ b/sequencer.c
@@ -293,6 +293,7 @@ static int do_recursive_merge(struct commit *base, struct commit *next,
        clean = merge_trees(&o,
                            head_tree,
                            next_tree, base_tree, &result);
+       strbuf_release(&o.obuf);
        if (clean < 0)
                return clean;