Johannes Schindelin <johannes.schindelin@xxxxxx> writes:
> diff --git a/merge-recursive.c b/merge-recursive.c
> index 311cfa4..a16b150 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->buffer_output < 2)
> + strbuf_release(&o->obuf);
> if (show(o, 2))
> diff_warn_rename_limit("merge.renamelimit",
> o->needed_rename_limit, 0);
Other two hunks looked good, but this one I am not sure what is
going on. It this were "if call-depth says we are called by another
merge_recursive, do not discard the buffer", I would understand, but
why does this have to be tied to o->buffer_output being "we buffer
the output but not errors"?
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html