From: Duy Nguyen <pclouds@gmail.com>
To: Jeff King <peff@peff.net>
Cc: Git Mailing List <git@vger.kernel.org>
Subject: Re: [PATCH] shallow: verify shallow file after taking lock
Date: Thu, 27 Feb 2014 17:18:58 +0700 [thread overview]
Message-ID: <CACsJy8AHwyy0wwFD3fu+Aak+k=bFM1NAWzVSs1G4389UWqZptg@mail.gmail.com> (raw)
In-Reply-To: <20140227092227.GA28551@sigill.intra.peff.net>
On Thu, Feb 27, 2014 at 4:22 PM, Jeff King <peff@peff.net> wrote:
> On Thu, Feb 27, 2014 at 04:10:12AM -0500, Jeff King wrote:
>
>> I also notice that check_shallow_file_for_update returns early if
>> !is_shallow. Is that safe? Is it possible for another process to have
>> made us shallow since the program began? In that case, we would have to
>> stat() the file always, then complain if it exists and !is_shallow.
I think it's safer to do it your way.
>
> That patch would look like this:
>
> diff --git a/shallow.c b/shallow.c
> index 75da07a..e05a241 100644
> --- a/shallow.c
> +++ b/shallow.c
> @@ -139,13 +139,13 @@ void check_shallow_file_for_update(void)
> {
> struct stat st;
>
> - if (!is_shallow)
> - return;
> - else if (is_shallow == -1)
> + if (is_shallow == -1)
> die("BUG: shallow must be initialized by now");
>
> if (stat(git_path("shallow"), &st))
> die("shallow file was removed during fetch");
> + else if (!is_shallow)
> + die("shallow file appeared during fetch");
> else if (st.st_mtime != shallow_stat.st_mtime
> #ifdef USE_NSEC
> || ST_MTIME_NSEC(st) != ST_MTIME_NSEC(shallow_stat)
>
> but again, I'm not really clear on whether this is possible.
>
> -Peff
--
Duy
next prev parent reply other threads:[~2014-02-27 10:19 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-02-27 7:13 [PATCH] upload-pack: allow shallow fetching from a read-only repository Nguyễn Thái Ngọc Duy
2014-02-27 9:04 ` Jeff King
2014-02-27 9:10 ` [PATCH] shallow: verify shallow file after taking lock Jeff King
2014-02-27 9:22 ` Jeff King
2014-02-27 10:18 ` Duy Nguyen [this message]
2014-02-27 10:56 ` [PATCH] shallow: use stat_validity to check for up-to-date file Jeff King
2014-02-27 10:11 ` [PATCH] upload-pack: allow shallow fetching from a read-only repository Duy Nguyen
2014-02-27 11:25 ` [PATCH] shallow: automatically clean up shallow tempfiles Jeff King
2014-03-04 12:30 ` [PATCH v2] upload-pack: allow shallow fetching from a read-only repository Nguyễn Thái Ngọc Duy
2014-03-04 18:10 ` Junio C Hamano
2014-03-05 12:43 ` Duy Nguyen
2014-03-05 19:50 ` Junio C Hamano
2014-03-06 8:49 ` [PATCH v3] upload-pack: send shallow info over stdin to pack-objects Nguyễn Thái Ngọc Duy
2014-03-06 18:37 ` Junio C Hamano
2014-03-06 23:13 ` Duy Nguyen
2014-03-07 18:27 ` Junio C Hamano
2014-03-08 0:08 ` Duy Nguyen
2014-03-10 15:23 ` Junio C Hamano
2014-03-07 1:24 ` Duy Nguyen
2014-03-07 18:33 ` Junio C Hamano
2014-03-11 12:59 ` [PATCH v4] " Nguyễn Thái Ngọc Duy
-- strict thread matches above, loose matches on Subject: below --
2014-03-15 3:47 [PATCH] shallow: verify shallow file after taking lock Jeff King
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='CACsJy8AHwyy0wwFD3fu+Aak+k=bFM1NAWzVSs1G4389UWqZptg@mail.gmail.com' \
--to=pclouds@gmail.com \
--cc=git@vger.kernel.org \
--cc=peff@peff.net \
/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).