Johannes Schindelin <johannes.schinde...@gmx.de> writes:

> The recursive merge machinery accumulates its output in an output
> buffer, to be flushed at the end of merge_recursive(). At this point,
> we forgot to release the output buffer.
> ...
> diff --git a/merge-recursive.c b/merge-recursive.c
> index ec50932..9e527de 100644
> --- 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);

OK, with !o->call_depth the change makes sense to me.
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to