Hi Junio,
On Wed, 27 Jul 2016, Junio C Hamano wrote:
> Johannes Schindelin writes:
>
> > The data structure passed to the recursive merge machinery has a feature
> > where the caller can ask for the output to be buffered into a strbuf, by
> > setting the field 'buffer_output'.
> >
> > Previousl
On Wed, Jul 27, 2016 at 2:37 PM, Junio C Hamano wrote:
>
>> + strbuf_vaddf(&o->obuf, err, params);
>> + error("%s", o->obuf.buf);
>> + strbuf_reset(&o->obuf);
>
> Sneaky ;-)
Just to avoid confusion, I am _fine_ with this "we happen to have
a strbuf that we know to be empty at this poi
Johannes Schindelin writes:
> The data structure passed to the recursive merge machinery has a feature
> where the caller can ask for the output to be buffered into a strbuf, by
> setting the field 'buffer_output'.
>
> Previously, we simply swallowed the buffered output when showing error
> messa
The data structure passed to the recursive merge machinery has a feature
where the caller can ask for the output to be buffered into a strbuf, by
setting the field 'buffer_output'.
Previously, we simply swallowed the buffered output when showing error
messages. With this patch, we show the output
4 matches
Mail list logo
