Re: [PATCH v6 16/16] merge-recursive: flush output buffer even when erroring out

From: Junio C Hamano <gitster@pobox.com>
Date: Aug 4, 2016, 18:20 UTC
Message-ID: <xmqq7fbw4cqo.fsf@gitster.mtv.corp.google.com>
In-Reply-To: <3b4494c586574b59d80d0f1b88bd4c3d56b678cf.1470051326.git.johannes.schindelin@gmx.de>

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

> Ever since 66a155b (Enable output buffering in merge-recursive.,
> 2007-01-14), we had a problem: When the merge failed in a fatal way, all
> regular output was swallowed because we called die() and did not get a
> chance to drain the output buffers.

OK. Even though I really wanted to see somebody else review this series as well, I finished reading it through one more time before that happened, which is unfortunate because I think this is ready to start cooking in 'next' even though I no longer have much faith in my eyes alone after staring at this series so many times---you start missing details.

Thanks.