From: Junio C Hamano <gitster@pobox.com>
To: Robbie Iannucci <iannucci@google.com>
Cc: git@vger.kernel.org, Johannes Schindelin <johannes.schindelin@gmx.de>
Subject: Re: Re* [BUG] Index.lock error message regression in git 2.11.0
Date: Wed, 07 Dec 2016 10:21:29 -0800 [thread overview]
Message-ID: <xmqqd1h3y506.fsf@gitster.mtv.corp.google.com> (raw)
In-Reply-To: <xmqq4m2gzotn.fsf_-_@gitster.mtv.corp.google.com> (Junio C. Hamano's message of "Tue, 06 Dec 2016 14:15:48 -0800")
Junio C Hamano <gitster@pobox.com> writes:
> ...
> I would not be surprised if some existing calls to hold_lock*()
> functions that pass die_on_error=0 need to be updated to pass
> LOCK_SILENT_ON_ERROR, and when this fix is taken alone, it may look
> like a regression, but we are better off starting louder and squelch
> the ones that we find safe to make silent than the other way around.
I actually take this part back, for two reasons.
* Before the recent js/sequencer-wo-die topic that made this
failure mode of 'git merge' more dangerous by accident, there
were already callers that passed die_on_error=0 to hold_lock*
family of functions, and we can trust these callers. They either
have been silent upon lock failure sensibly (e.g. a caller that
tries to acquire the lock to opportunistically update the index
can safely choose not to do anything and be silent) or they have
had their own way of reporting the errors to the users. The "you
need to ask to be totally quiet" approach in my rerolled patch
(the one I am responding to) will introduce new regressions to
these codepaths.
* Among the ones that stopped passing die_on_error=1 when the topic
was merged, there are
ones that give sensible error messages. Again, they do not need
extra message with the "you need to ask to be totally quiet"
approach [*1*].
We need to instead go through the latter, i.e. the ones that appear
in "git show --first-parent 2a4062a4a8", with fine-toothed comb to
see which 0 made an error totally silent (like the one Robbie
spotted in merge.c) and fix them to ask hold_lock*() functions not
to die but still report an error.
next prev parent reply other threads:[~2016-12-07 18:21 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 [this message]
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
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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=xmqqd1h3y506.fsf@gitster.mtv.corp.google.com \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=iannucci@google.com \
--cc=johannes.schindelin@gmx.de \
/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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).