From: Johannes Schindelin <Johannes.Schindelin@gmx.de>
To: Duy Nguyen <pclouds@gmail.com>
Cc: Jeff King <peff@peff.net>,
Felipe Contreras <felipe.contreras@gmail.com>,
Git Mailing List <git@vger.kernel.org>,
Junio C Hamano <gitster@pobox.com>
Subject: Re: [RFC/PATCH 0/5] Fix fetch regression with transport helpers
Date: Thu, 6 Jun 2019 15:07:02 +0200 (CEST) [thread overview]
Message-ID: <nycvar.QRO.7.76.6.1906061505310.42@tvgsbejvaqbjf.bet> (raw)
In-Reply-To: <CACsJy8DKWoerME5BykVmihyX2eX10YTO0BNyVc7MGjwp_Shg2Q@mail.gmail.com>
Hi Duy,
On Wed, 5 Jun 2019, Duy Nguyen wrote:
> On Wed, Jun 5, 2019 at 6:27 PM Jeff King <peff@peff.net> wrote:
> >
> > On Wed, Jun 05, 2019 at 10:12:12AM +0200, Johannes Schindelin wrote:
> >
> > > This fails on macOS, in t5601, both in our osx-clang and osx-gcc jobs, as
> > > well as in the StaticAnalysis job. For details, see
> > > https://dev.azure.com/gitgitgadget/git/_build/results?buildId=10206
> >
> > Hmm. I'm having a hard time seeing why (and I can't seem to reproduce it
> > locally on a case-insensitive HFS+ filesystem under Linux).
> >
> > In particular, if the problem is here:
> >
> > > expecting success:
> > > grep X icasefs/warning &&
> > > grep x icasefs/warning &&
> > > test_i18ngrep "the following paths have collided" icasefs/warning
> > >
> > > ++ grep X icasefs/warning
> > > error: last command exited with $?=1
> > > not ok 99 - colliding file detection
> >
> > then that implies it has to do with the checkout phase, which Felipe's
> > patch doesn't touch. Later in the log we see the actual file contents
> > (I'm confused as to how this gets here; it looks like debugging bits
> > that were added after the main script?):
> >
> > 2019-06-05T07:58:37.7961890Z Cloning into 'bogus'...
> > 2019-06-05T07:58:37.7962430Z done.
> > 2019-06-05T07:58:37.7963360Z warning: the following paths have collided (e.g. case-sensitive paths
> > 2019-06-05T07:58:37.7964300Z on a case-insensitive filesystem) and only one from the same
> > 2019-06-05T07:58:37.7964880Z colliding group is in the working tree:
> > 2019-06-05T07:58:37.7965290Z
> > 2019-06-05T07:58:37.7966250Z 'x'
> >
> > whereas a succeeding test expects us to mention both 'x' and 'X'.
> >
> > So we _did_ find the collision, but somehow 'X' was not reported.
> > Looking at the code, I'm not even sure how that could happen. Given that
> > this process does involve looking at stat data, it makes me wonder if
>
> It does use stat data in mark_colliding_entries() if core.checkStat is
> false. I think on MacOS it's actually true.
>
> I vaguely recall seeing just one 'x' once. I think last time I had a
> problem with truncating st_ino, but that should be fixed in e66ceca94b
> (clone: fix colliding file detection on APFS, 2018-11-20). So no idea
> how this happens again.
Good catch. I think the reason it happens again is simply that Junio
picked a base commit that is older than the commit you referenced.
Point in favor: Junio merged these here patches into `pu` and those
test failures (as well as the StaticAnalysis issues) are gone.
Thanks,
Johannes
>
> > there could be some raciness involved. But again, I'm scratching my head
> > as to how exactly, and I couldn't reproduce it under load or with some
> > carefully inserted sleep() calls.
> --
> Duy
>
next prev parent reply other threads:[~2019-06-06 13:07 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-06-04 2:13 [RFC/PATCH 0/5] Fix fetch regression with transport helpers Felipe Contreras
2019-06-04 2:13 ` [RFC/PATCH 1/5] t5801 (remote-helpers): cleanup refspec stuff Felipe Contreras
2019-06-04 14:16 ` Jeff King
2019-06-04 2:13 ` [RFC/PATCH 2/5] t5801 (remote-helpers): add test to fetch tags Felipe Contreras
2019-06-04 14:22 ` Jeff King
2019-06-04 2:13 ` [RFC/PATCH 3/5] fetch: trivial cleanup Felipe Contreras
2019-06-04 2:13 ` [RFC/PATCH 4/5] fetch: make the code more understandable Felipe Contreras
2019-06-04 2:13 ` [RFC/PATCH 5/5] fetch: fix regression with transport helpers Felipe Contreras
2019-06-04 14:32 ` Jeff King
2019-06-04 19:17 ` Junio C Hamano
2019-06-04 14:35 ` [RFC/PATCH 0/5] Fix fetch " Jeff King
2019-06-04 19:15 ` Felipe Contreras
2019-06-05 8:12 ` Johannes Schindelin
2019-06-05 11:27 ` Jeff King
2019-06-05 12:22 ` Duy Nguyen
2019-06-06 13:07 ` Johannes Schindelin [this message]
2019-06-06 16:13 ` Junio C Hamano
2019-06-07 5:32 ` CI builds on GitGitGadget, was " Johannes Schindelin
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=nycvar.QRO.7.76.6.1906061505310.42@tvgsbejvaqbjf.bet \
--to=johannes.schindelin@gmx.de \
--cc=felipe.contreras@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=pclouds@gmail.com \
--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).