From: Junio C Hamano <gitster@pobox.com>
To: "Nguyễn Thái Ngọc Duy" <pclouds@gmail.com>
Cc: christophe.bliard@trux.info, git@vger.kernel.org,
rafa.almas@gmail.com, Eric Sunshine <sunshine@sunshineco.com>
Subject: Re: [PATCH v2] tree-walk.c: fix overoptimistic inclusion in :(exclude) matching
Date: Mon, 05 Nov 2018 10:50:01 +0900 [thread overview]
Message-ID: <xmqq36sgl2d2.fsf@gitster-ct.c.googlers.com> (raw)
In-Reply-To: <20181104052851.12584-1-pclouds@gmail.com> ("Nguyễn Thái Ngọc Duy"'s message of "Sun, 4 Nov 2018 06:28:51 +0100")
Nguyễn Thái Ngọc Duy <pclouds@gmail.com> writes:
> tree_entry_interesting() is used for matching pathspec on a tree. The
> interesting thing about this function is that, because the tree
> entries are known to be sorted, this function can return more than
> just "yes, matched" and "no, not matched". It can also say "yes, this
> entry is matched and so is the remaining entries in the tree".
>
> This is where I made a mistake when matching exclude pathspec. For
> exclude pathspec, we do matching twice, one with positive patterns and
> one with negative ones, then a rule table is applied to determine the
> final "include or exclude" result. Note that "matched" does not
> necessarily mean include. For negative patterns, "matched" means
> exclude.
>
> This particular rule is too eager to include everything. Rule 8 says
> that "if all entries are positively matched" and the current entry is
> not negatively matched (i.e. not excluded), then all entries are
> positively matched and therefore included. But this is not true. If
> the _current_ entry is not negatively matched, it does not mean the
> next one will not be and we cannot conclude right away that all
> remaining entries are positively matched and can be included.
>
> Rules 8 and 18 are now updated to be less eager. We conclude that the
> current entry is positively matched and included. But we say nothing
> about remaining entries. tree_entry_interesting() will be called again
> for those entries where we will determine entries individually.
Thanks. Will queue.
> Reported-by: Christophe Bliard <christophe.bliard@trux.info>
> Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
> ---
> v2 fixes the too broad "git add ." in the test
>
> t/t6132-pathspec-exclude.sh | 17 +++++++++++++++++
> tree-walk.c | 11 ++++++++---
> 2 files changed, 25 insertions(+), 3 deletions(-)
>
> diff --git a/t/t6132-pathspec-exclude.sh b/t/t6132-pathspec-exclude.sh
> index eb829fce97..2462b19ddd 100755
> --- a/t/t6132-pathspec-exclude.sh
> +++ b/t/t6132-pathspec-exclude.sh
> @@ -194,4 +194,21 @@ test_expect_success 'multiple exclusions' '
> test_cmp expect actual
> '
>
> +test_expect_success 't_e_i() exclude case #8' '
> + git init case8 &&
> + (
> + cd case8 &&
> + echo file >file1 &&
> + echo file >file2 &&
> + git add file1 file2 &&
> + git commit -m twofiles &&
> + git grep -l file HEAD :^file2 >actual &&
> + echo HEAD:file1 >expected &&
> + test_cmp expected actual &&
> + git grep -l file HEAD :^file1 >actual &&
> + echo HEAD:file2 >expected &&
> + test_cmp expected actual
> + )
> +'
> +
> test_done
> diff --git a/tree-walk.c b/tree-walk.c
> index 77b37f36fa..79bafbd1a2 100644
> --- a/tree-walk.c
> +++ b/tree-walk.c
> @@ -1107,7 +1107,7 @@ enum interesting tree_entry_interesting(const struct name_entry *entry,
> * 5 | file | 1 | 1 | 0
> * 6 | file | 1 | 2 | 0
> * 7 | file | 2 | -1 | 2
> - * 8 | file | 2 | 0 | 2
> + * 8 | file | 2 | 0 | 1
> * 9 | file | 2 | 1 | 0
> * 10 | file | 2 | 2 | -1
> * -----+-------+----------+----------+-------
> @@ -1118,7 +1118,7 @@ enum interesting tree_entry_interesting(const struct name_entry *entry,
> * 15 | dir | 1 | 1 | 1 (*)
> * 16 | dir | 1 | 2 | 0
> * 17 | dir | 2 | -1 | 2
> - * 18 | dir | 2 | 0 | 2
> + * 18 | dir | 2 | 0 | 1
> * 19 | dir | 2 | 1 | 1 (*)
> * 20 | dir | 2 | 2 | -1
> *
> @@ -1134,7 +1134,12 @@ enum interesting tree_entry_interesting(const struct name_entry *entry,
>
> negative = do_match(entry, base, base_offset, ps, 1);
>
> - /* #3, #4, #7, #8, #13, #14, #17, #18 */
> + /* #8, #18 */
> + if (positive == all_entries_interesting &&
> + negative == entry_not_interesting)
> + return entry_interesting;
> +
> + /* #3, #4, #7, #13, #14, #17 */
> if (negative <= entry_not_interesting)
> return positive;
prev parent reply other threads:[~2018-11-05 1:50 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <CAGOLd-7Hi+tssj4ozKPd04squ-PuFwtt6f2nhbZp-zKwy62pVQ@mail.gmail.com>
2018-10-24 14:53 ` bug?: git grep HEAD with exclude in pathspec not taken into account Christophe Bliard
2018-10-24 15:14 ` Duy Nguyen
2018-10-24 15:39 ` Christophe Bliard
2018-10-27 14:57 ` Duy Nguyen
2018-11-03 15:30 ` [PATCH] tree-walk.c: fix overoptimistic inclusion in :(exclude) matching Nguyễn Thái Ngọc Duy
2018-11-04 0:25 ` Eric Sunshine
2018-11-04 6:27 ` Eric Sunshine
2018-11-04 6:29 ` Duy Nguyen
2018-11-04 5:28 ` [PATCH v2] " Nguyễn Thái Ngọc Duy
2018-11-05 1:50 ` Junio C Hamano [this message]
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=xmqq36sgl2d2.fsf@gitster-ct.c.googlers.com \
--to=gitster@pobox.com \
--cc=christophe.bliard@trux.info \
--cc=git@vger.kernel.org \
--cc=pclouds@gmail.com \
--cc=rafa.almas@gmail.com \
--cc=sunshine@sunshineco.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).