From: Durham Goode <durham@fb.com>
To: Duy Nguyen <pclouds@gmail.com>
Cc: <git@vger.kernel.org>, Mateusz Kwapich <mitrandir@fb.com>
Subject: Re: bug: sparse config interpretation incorrectness in 2.8.0-rc2
Date: Wed, 16 Mar 2016 23:49:28 -0700 [thread overview]
Message-ID: <56EA5378.4070001@fb.com> (raw)
In-Reply-To: <20160317005632.GA17778@duynguyen-vnpc.dek-tpc.internal>
On 3/16/16 5:56 PM, Duy Nguyen wrote:
> On Wed, Mar 16, 2016 at 05:09:23PM -0700, Durham Goode wrote:
>> Using git 2.8.0-rc2, given a repo with the following files:
>>
>> - one/hideme
>> - one/donthide
>> - two/foo
>>
>> A sparse config of:
>>
>> cat > .git/info/sparse-checkout <<EOF
>> /*
>> !one/hideme
>> EOF
>>
>> Results in a repository that only has `one/donthide` in it. I would
>> expect `two/foo`to be present as well. This worked in 2.6, and
>> bisecting it points to d589a67eceacd1cc171bbe94906ca7c9a0edd8c5
>> "dir.c: don't exclude whole dir prematurely" (author cc'd).
> Thank you. This should fix it. I think I understand why it goes
> wrong. I'm going to run some more tests and post a proper patch later.
>
> -- 8< --
> diff --git a/dir.c b/dir.c
> index 69e0be6..77f38a5 100644
> --- a/dir.c
> +++ b/dir.c
> @@ -1027,7 +1027,6 @@ static struct exclude *last_exclude_matching_from_list(const char *pathname,
> exc = x;
> break;
> }
> - continue;
> }
>
> if (x->flags & EXC_FLAG_MUSTBEDIR) {
> -- 8< --
> --
> Duy
To provide some perspective on the severity of this bug: all of our
users who were using sparse checkouts had their working copy mostly
deleted when they did a checkout after we upgraded to 2.8.0-rc2. So I'd
think this is a fix that should get in to 2.8.
next prev parent reply other threads:[~2016-03-17 6:49 UTC|newest]
Thread overview: 30+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-03-17 0:09 bug: sparse config interpretation incorrectness in 2.8.0-rc2 Durham Goode
2016-03-17 0:56 ` Duy Nguyen
2016-03-17 6:49 ` Durham Goode [this message]
2016-03-17 7:51 ` Junio C Hamano
2016-03-17 10:17 ` Duy Nguyen
2016-03-17 13:04 ` Johannes Schindelin
2016-03-17 13:20 ` Duy Nguyen
2016-03-17 13:46 ` Johannes Schindelin
2016-03-17 14:00 ` Duy Nguyen
2016-03-18 15:49 ` Johannes Schindelin
2016-03-17 7:22 ` Junio C Hamano
2016-03-17 17:51 ` Durham Goode
2016-03-17 12:45 ` [PATCH 1/2] dir.c: fix bug in 'nd/exclusion-regression-fix' topic Nguyễn Thái Ngọc Duy
2016-03-17 12:45 ` Nguyễn Thái Ngọc Duy
2016-03-17 12:54 ` [PATCH 3/2] dir.c: fix dir re-inclusion rules with "NODIR" and "MUSTBEDIR" Nguyễn Thái Ngọc Duy
2016-03-17 23:49 ` Junio C Hamano
2016-03-18 0:15 ` Duy Nguyen
2016-03-18 5:40 ` Junio C Hamano
2016-03-18 5:51 ` Duy Nguyen
2016-03-18 5:58 ` Eric Sunshine
2016-03-18 4:51 ` Durham Goode
2016-03-18 5:40 ` Duy Nguyen
2016-03-18 6:21 ` Durham Goode
2016-03-18 6:28 ` Duy Nguyen
2016-03-18 18:00 ` Junio C Hamano
2016-03-18 18:37 ` Extending this cycle by a week and reverting !reinclusion topic Junio C Hamano
2016-03-19 1:03 ` [PATCH 3/2] dir.c: fix dir re-inclusion rules with "NODIR" and "MUSTBEDIR" Duy Nguyen
2016-03-17 12:45 ` [PATCH 2/2] dir.c: correct "stuck" logging logic Nguyễn Thái Ngọc Duy
2016-03-17 12:45 ` Nguyễn Thái Ngọc Duy
2016-03-18 17:38 ` [PATCH 1/2] dir.c: fix bug in 'nd/exclusion-regression-fix' topic 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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=56EA5378.4070001@fb.com \
--to=durham@fb.com \
--cc=git@vger.kernel.org \
--cc=mitrandir@fb.com \
--cc=pclouds@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.
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 NNTP newsgroup(s).