From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 09 Oct 2015 00:52:56 GMT
Subject: Re: [PATCH 0/2] Reinstate the helpful message when `git pull --rebase` fails
Message-ID: <xmqq612grhg7.fsf@gitster.mtv.corp.google.com>
In-Reply-To: <cover.1444336120.git.johannes.schindelin@gmx.de>

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

> Brendan Forster noticed that we no longer see the helpful message after
> a failed `git pull --rebase`. It turns out that the builtin `am` calls
> the recursive merge function directly, not via a separate process.
>
> But that function was not really safe to be called that way, as it
> die()s pretty liberally.

If that is the case, I'd thinkg that we'd prefer, as a regression
fix to correct "that", i.e., let recursive-merge die and let the
caller catch its exit status.

Paul, what do you think?