From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Thu, 08 Dec 2016 11:53:39 GMT
Subject: Re: [PATCH 3/3] lockfile: LOCK_REPORT_ON_ERROR
Message-ID: <alpine.DEB.2.20.1612081252490.23160@virtualbox>
In-Reply-To: <20161207194105.25780-4-gitster@pobox.com>

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