From: Johannes Schindelin <Johannes.Schindelin@gmx.de>
To: Junio C Hamano <gitster@pobox.com>
Cc: git@vger.kernel.org, Robbie Iannucci <iannucci@google.com>
Subject: Re: [PATCH 3/3] lockfile: LOCK_REPORT_ON_ERROR
Date: Thu, 8 Dec 2016 12:53:39 +0100 (CET) [thread overview]
Message-ID: <alpine.DEB.2.20.1612081252490.23160@virtualbox> (raw)
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
next prev parent reply other threads:[~2016-12-08 11:55 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-12-03 1:44 [BUG] Index.lock error message regression in git 2.11.0 Robbie Iannucci
2016-12-03 1:52 ` Robbie Iannucci
2016-12-06 21:56 ` Junio C Hamano
2016-12-06 22:15 ` Re* " Junio C Hamano
2016-12-07 18:21 ` Junio C Hamano
2016-12-07 19:41 ` [PATCH 0/3] Do not be totally silent upon lock error Junio C Hamano
2016-12-07 19:41 ` [PATCH 1/3] wt-status: implement opportunisitc index update correctly Junio C Hamano
2016-12-07 20:48 ` Stefan Beller
2016-12-07 20:53 ` Junio C Hamano
2016-12-07 20:56 ` Stefan Beller
2016-12-07 21:08 ` Junio C Hamano
2016-12-07 22:06 ` Stefan Beller
2016-12-08 10:18 ` Paul Tan
2016-12-08 18:01 ` Junio C Hamano
2016-12-07 19:41 ` [PATCH 2/3] hold_locked_index(): align error handling with hold_lockfile_for_update() Junio C Hamano
2016-12-07 19:41 ` [PATCH 3/3] lockfile: LOCK_REPORT_ON_ERROR Junio C Hamano
2016-12-08 11:53 ` Johannes Schindelin [this message]
2016-12-08 18:10 ` Robbie Iannucci
2016-12-08 18:22 ` Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=alpine.DEB.2.20.1612081252490.23160@virtualbox \
--to=johannes.schindelin@gmx.de \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=iannucci@google.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox