Re: [PATCH 3/3] lockfile: LOCK_REPORT_ON_ERROR

From: Robbie Iannucci <iannucci@google.com>
Date: Dec 8, 2016, 18:10 UTC
Message-ID: <CA+q_oBfTs7_-sNujG0wgUu7DDSyukx6DbYcNRTnKxZbc7LWNpQ@mail.gmail.com>
In-Reply-To: <alpine.DEB.2.20.1612081252490.23160@virtualbox>

Thanks all for taking a look at this, I didn't expect such a quick response :).

No hard feelings re: breakage; I know how gnarly these sorts of refactors can be (and more libification is always better :)).

Robbie

On Thu, Dec 8, 2016 at 3:53 AM, Johannes Schindelin <Johannes.Schindelin@gmx.de> wrote:

Show 17 quoted lines

> Hi Junio,
>
> On Wed, 7 Dec 2016, Junio C Hamano wrote:
>
>> The "libify sequencer" topic stopped passing the die_on_error option
>> to hold_locked_index(), and this lost an error message from "git
>> merge --ff-only $commit" when there are competing updates in
>> progress.
>
> Sorry for the breakage.
>
> When libifying the code, I tried to be careful to retain the error
> messages when not dying, and mistakenly assumed that hold_locked_index()
> would do the same.
>
> Ciao,
> Dscho