From: Junio C Hamano <gitster@pobox.com>
To: git@vger.kernel.org
Cc: Robbie Iannucci <iannucci@google.com>,
Johannes Schindelin <johannes.schindelin@gmx.de>
Subject: [PATCH 0/3] Do not be totally silent upon lock error
Date: Wed, 7 Dec 2016 11:41:02 -0800 [thread overview]
Message-ID: <20161207194105.25780-1-gitster@pobox.com> (raw)
In-Reply-To: <xmqqd1h3y506.fsf@gitster.mtv.corp.google.com>
Robbie Iannucci reported that "git merge" that fast-forwards fails
silently when a competing or stale index.lock is present in recent
Git:
$ git merge --ff-only master; echo $?
Updating 454cb6bd52..8d7a455ed5
1
$ exit
Did the update happen? We used to give "fatal: Unable to create
..." followed by "Another git process seems to be running..."
advice, and that would have helped the user from the confusion.
This was because there were only two choices available to the
callers of the lockfile API--they can either ask it to die with
message when the lock cannot be acquired, or ask it to silently
return -1 to signal an error. The recent "libify sequencer" topic
turned many existing "please die" calls to "just silently return
-1", and while it added new "unable to lock" error messages to most
of them, one spot didn't get any and now is allowed to just die
silently.
This series should fix it:
- 1/3 is something I noticed while reading the existing callers of
the lockfile API, and is not a new issue with "libify sequencer"
topic.
- 2/3 gives a new third option to callers of the lockfile API; they
can now say "please emit the usual error message upon failing to
acquire the lock, but give control back to me".
- 3/3 uses the new option to resurrect the message.
Junio C Hamano (3):
wt-status: implement opportunisitc index update correctly
hold_locked_index(): align error handling with hold_lockfile_for_update()
lockfile: LOCK_REPORT_ON_ERROR
apply.c | 2 +-
builtin/add.c | 2 +-
builtin/am.c | 6 +++---
builtin/checkout-index.c | 2 +-
builtin/checkout.c | 4 ++--
builtin/clone.c | 2 +-
builtin/commit.c | 8 ++++----
builtin/merge.c | 6 +++---
builtin/mv.c | 2 +-
builtin/read-tree.c | 2 +-
builtin/reset.c | 2 +-
builtin/rm.c | 2 +-
builtin/update-index.c | 1 +
lockfile.c | 12 ++++++++++--
lockfile.h | 8 +++++++-
merge-recursive.c | 2 +-
merge.c | 2 +-
read-cache.c | 7 ++-----
rerere.c | 2 +-
sequencer.c | 2 +-
t/helper/test-scrap-cache-tree.c | 2 +-
wt-status.c | 7 ++++---
22 files changed, 49 insertions(+), 36 deletions(-)
--
2.11.0-274-g0631465056
next prev parent reply other threads:[~2016-12-07 19:41 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 ` Junio C Hamano [this message]
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=20161207194105.25780-1-gitster@pobox.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).