From: Jeff King <peff@peff.net>
To: Junio C Hamano <gitster@pobox.com>
Cc: lars.schneider@autodesk.com, git@vger.kernel.org,
t.gummerer@gmail.com, jrnieder@gmail.com,
Lars Schneider <larsxschneider@gmail.com>
Subject: Re: [PATCH v1 2/2] entry.c: check if file exists after checkout
Date: Fri, 6 Oct 2017 00:56:40 -0400 [thread overview]
Message-ID: <20171006045640.vihagnlnuximzmjs@sigill.intra.peff.net> (raw)
In-Reply-To: <xmqqlgkoyk8n.fsf@gitster.mtv.corp.google.com>
On Fri, Oct 06, 2017 at 01:26:48PM +0900, Junio C Hamano wrote:
> > We could probably be a bit more specific about the situation, since the
> > user will see this message with no context. Maybe something like:
> >
> > unable to stat just-written file %s
> >
> > or something. We should probably also use error_errno(). I'd bet if this
> > ever triggers that it's likely to be ENOENT, but certainly if it _isn't_
> > that would be interesting information.
>
> ENOTDIR and to a lesser degree EACCES and ELOOP are also
> uninteresting, as we are talking about somebody else mucking with
> the filesystem.
True. The nice thing about the error() route is that we don't need to
make such judgements. The user can decide what is unexpected.
> -- >8 --
> From: Lars Schneider <larsxschneider@gmail.com>
> Date: Thu, 5 Oct 2017 12:44:07 +0200
> Subject: [PATCH] entry.c: check if file exists after checkout
>
> If we are checking out a file and somebody else racily deletes our file,
> then we would write garbage to the cache entry. Fix that by checking
> the result of the lstat() call on that file. Print an error to the user
> if the file does not exist.
I don't know if we wanted to capture any of the reasoning behind using
error() here or not. Frankly, I'm not sure how to argue for it
succinctly. :) I'm happy with letting it live on in the list archive.
> diff --git a/entry.c b/entry.c
> index f879758c73..6d9de3a5aa 100644
> --- a/entry.c
> +++ b/entry.c
> @@ -341,7 +341,9 @@ static int write_entry(struct cache_entry *ce,
> if (state->refresh_cache) {
> assert(state->istate);
> if (!fstat_done)
> - lstat(ce->name, &st);
> + if (lstat(ce->name, &st) < 0)
> + return error_errno("unable stat just-written file %s",
> + ce->name);
s/unable stat/unable to stat/, I think.
Other than that, this looks fine to me.
-Peff
next prev parent reply other threads:[~2017-10-06 4:56 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-10-05 10:44 [PATCH v1 0/2] fix temporary garbage in the cache entry lars.schneider
2017-10-05 10:44 ` [PATCH v1 1/2] entry.c: update cache entry only for existing files lars.schneider
2017-10-05 11:12 ` Jeff King
2017-10-05 11:19 ` Junio C Hamano
2017-10-05 11:26 ` Jeff King
2017-10-05 23:01 ` Junio C Hamano
2017-10-06 4:54 ` Jeff King
2017-10-08 21:37 ` Lars Schneider
2017-10-09 17:47 ` Jeff King
2017-10-09 17:48 ` [PATCH 1/3] write_entry: fix leak when retrying delayed filter Jeff King
2017-10-10 0:00 ` Junio C Hamano
2017-10-10 9:23 ` Simon Ruderich
2017-10-10 9:25 ` Jeff King
2017-10-10 9:49 ` Simon Ruderich
2017-10-09 17:48 ` [PATCH 2/3] write_entry: avoid reading blobs in CE_RETRY case Jeff King
2017-10-10 0:00 ` Junio C Hamano
2017-10-09 17:50 ` [PATCH 3/3] write_entry: untangle symlink and regular-file cases Jeff King
2017-10-10 0:03 ` Junio C Hamano
2017-10-05 10:44 ` [PATCH v1 2/2] entry.c: check if file exists after checkout lars.schneider
2017-10-05 11:23 ` Jeff King
2017-10-06 4:26 ` Junio C Hamano
2017-10-06 4:56 ` Jeff King [this message]
2017-10-06 6:03 ` Junio C Hamano
2017-10-06 6:05 ` Jeff King
2017-10-06 7:58 ` Junio C Hamano
2017-10-08 21:41 ` Lars Schneider
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=20171006045640.vihagnlnuximzmjs@sigill.intra.peff.net \
--to=peff@peff.net \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=jrnieder@gmail.com \
--cc=lars.schneider@autodesk.com \
--cc=larsxschneider@gmail.com \
--cc=t.gummerer@gmail.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.
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).