From: Junio C Hamano <gitster@pobox.com>
To: "Nguyễn Thái Ngọc Duy" <pclouds@gmail.com>
Cc: git@vger.kernel.org
Subject: Re: [PATCH 14/19] Convert ce_path_match() use to match_pathspec()
Date: Mon, 13 Dec 2010 11:31:51 -0800 [thread overview]
Message-ID: <7vsjy1zcyg.fsf@alter.siamese.dyndns.org> (raw)
In-Reply-To: 1292233616-27692-15-git-send-email-pclouds@gmail.com
Nguyễn Thái Ngọc Duy <pclouds@gmail.com> writes:
> Previously ce_path_match() is used together with tree_entry_interesting().
> Both do not support wildcards. tree_entry_interesting() understands
> wildcards now, so it's time to teach ce_path_match() to do the same.
>
> Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
> ---
This function is called from both Porcelains (e.g. "git diff" via
diff-lib.c and "git status" via wt-status.c) and plumbing commands
(e.g. "git update-index"), and we are changing the semantics in a big way,
even though it is a huge improvement.
I am fairly excited with the progress of this series. When it gets merged
to 'master', we will be declaring 1.8.0 ;-)
I imagine that eventually ce_path_match() will also take "struct pathspec *"
not "const char **" when the series is completed, yes? Or there is no
real need for that?
> read-cache.c | 20 +-------------------
> 1 files changed, 1 insertions(+), 19 deletions(-)
>
> diff --git a/read-cache.c b/read-cache.c
> index 1f42473..cbabd8b 100644
> --- a/read-cache.c
> +++ b/read-cache.c
> @@ -685,28 +685,10 @@ int ce_same_name(struct cache_entry *a, struct cache_entry *b)
>
> int ce_path_match(const struct cache_entry *ce, const char **pathspec)
> {
> - const char *match, *name;
> - int len;
> -
> if (!pathspec)
> return 1;
>
> - len = ce_namelen(ce);
> - name = ce->name;
> - while ((match = *pathspec++) != NULL) {
> - int matchlen = strlen(match);
> - if (matchlen > len)
> - continue;
> - if (memcmp(name, match, matchlen))
> - continue;
> - if (matchlen && name[matchlen-1] == '/')
> - return 1;
> - if (name[matchlen] == '/' || !name[matchlen])
> - return 1;
> - if (!matchlen)
> - return 1;
> - }
> - return 0;
> + return match_pathspec(pathspec, ce->name, ce_namelen(ce), 0, NULL);
> }
>
> /*
> --
> 1.7.3.3.476.g10a82
next prev parent reply other threads:[~2010-12-13 19:32 UTC|newest]
Thread overview: 45+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-12-13 9:46 [PATCH 00/19] nd/struct-pathspec (or pathspec unification [1]) Nguyễn Thái Ngọc Duy
2010-12-13 9:46 ` [PATCH 01/19] Add struct pathspec Nguyễn Thái Ngọc Duy
2010-12-13 17:31 ` Thiago Farina
2010-12-14 12:50 ` Nguyen Thai Ngoc Duy
2010-12-13 9:46 ` [PATCH 02/19] diff-no-index: use diff_tree_setup_paths() Nguyễn Thái Ngọc Duy
2010-12-13 9:46 ` [PATCH 03/19] pathspec: cache string length when initializing pathspec Nguyễn Thái Ngọc Duy
2010-12-13 9:46 ` [PATCH 04/19] Convert struct diff_options to use struct pathspec Nguyễn Thái Ngọc Duy
2010-12-13 19:00 ` Junio C Hamano
2010-12-14 5:02 ` Nguyen Thai Ngoc Duy
2010-12-13 9:46 ` [PATCH 05/19] tree_entry_interesting(): remove dependency on struct diff_options Nguyễn Thái Ngọc Duy
2010-12-13 19:11 ` Junio C Hamano
2010-12-13 9:46 ` [PATCH 06/19] Move tree_entry_interesting() to tree-walk.c and export it Nguyễn Thái Ngọc Duy
2010-12-13 9:46 ` [PATCH 07/19] glossary: define pathspec Nguyễn Thái Ngọc Duy
2010-12-13 9:46 ` [PATCH 08/19] pathspec: mark wildcard pathspecs from the beginning Nguyễn Thái Ngọc Duy
2010-12-13 18:09 ` Junio C Hamano
2010-12-13 9:46 ` [PATCH 09/19] tree-diff.c: reserve space in "base" for pathname concatenation Nguyễn Thái Ngọc Duy
2010-12-13 18:10 ` Junio C Hamano
2010-12-14 5:00 ` Nguyen Thai Ngoc Duy
2010-12-14 5:32 ` Junio C Hamano
2010-12-14 7:10 ` Nguyen Thai Ngoc Duy
2010-12-14 7:32 ` Johannes Sixt
2010-12-14 7:43 ` Nguyen Thai Ngoc Duy
2010-12-14 8:21 ` Johannes Sixt
2010-12-14 13:01 ` Nguyen Thai Ngoc Duy
2010-12-14 17:11 ` Junio C Hamano
2010-12-13 9:46 ` [PATCH 10/19] tree_entry_interesting(): factor out most matching logic Nguyễn Thái Ngọc Duy
2010-12-13 18:10 ` Junio C Hamano
2010-12-13 9:46 ` [PATCH 11/19] tree_entry_interesting: support depth limit Nguyễn Thái Ngọc Duy
2010-12-13 18:10 ` Junio C Hamano
2010-12-14 14:44 ` Nguyen Thai Ngoc Duy
2010-12-13 9:46 ` [PATCH 12/19] tree_entry_interesting(): support wildcard matching Nguyễn Thái Ngọc Duy
2010-12-13 18:10 ` Junio C Hamano
2010-12-14 15:04 ` Nguyen Thai Ngoc Duy
2010-12-13 9:46 ` [PATCH 13/19] tree_entry_interesting(): optimize fnmatch when base is matched Nguyễn Thái Ngọc Duy
2010-12-13 18:10 ` Junio C Hamano
2010-12-13 9:46 ` [PATCH 14/19] Convert ce_path_match() use to match_pathspec() Nguyễn Thái Ngọc Duy
2010-12-13 19:31 ` Junio C Hamano [this message]
2010-12-14 15:14 ` Nguyen Thai Ngoc Duy
2010-12-13 9:46 ` [PATCH 15/19] pathspec: add match_pathspec_depth() Nguyễn Thái Ngọc Duy
2010-12-13 19:28 ` Junio C Hamano
2010-12-14 5:07 ` Nguyen Thai Ngoc Duy
2010-12-13 9:46 ` [PATCH 16/19] grep: convert to use struct pathspec Nguyễn Thái Ngọc Duy
2010-12-13 9:46 ` [PATCH 17/19] grep: use match_pathspec_depth() for cache/worktree grepping Nguyễn Thái Ngọc Duy
2010-12-13 9:46 ` [PATCH 18/19] grep: use preallocated buffer for grep_tree() Nguyễn Thái Ngọc Duy
2010-12-13 9:46 ` [PATCH 19/19] grep: drop pathspec_matches() in favor of tree_entry_interesting() Nguyễn Thái Ngọc Duy
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=7vsjy1zcyg.fsf@alter.siamese.dyndns.org \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--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.
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).