merge_trees(): ensure that the callers release output buffer

diff --git a/merge-recursive.c b/merge-recursive.c
index ec50932210807b2fd1f14e11694d00c7e2c21d15..9e527dec62a71940174a31a3a8040f2498ad6c73 100644 (file)
--- a/merge-recursive.c
+++ b/merge-recursive.c
@@ -2078,6 +2078,8 @@ int merge_recursive(struct merge_options *o,
                commit_list_insert(h2, &(*result)->parents->next);
        }
        flush_output(o);
+       if (!o->call_depth && o->buffer_output < 2)
+               strbuf_release(&o->obuf);
        if (show(o, 2))
                diff_warn_rename_limit("merge.renamelimit",
                                       o->needed_rename_limit, 0);