From: Junio C Hamano <gitster@pobox.com>
To: Linus Torvalds <torvalds@linux-foundation.org>
Cc: git@vger.kernel.org
Subject: [RFC/PATCH] Making ce_path_match() more useful by accepting globs
Date: Sun, 25 Nov 2007 12:35:18 -0800 [thread overview]
Message-ID: <7vsl2ujc6x.fsf@gitster.siamese.dyndns.org> (raw)
Currently, these do not work:
git diff-files 't/*.sh'
git diff-index HEAD 'xdiff/*.c'
git update-index -g 'Documentation/howto/*.txt'
This is because ce_path_match(), the underlying function that is used to
see if a cache entry matches the set of pathspecs, only understands
leading directory match.
This teaches ce_path_match() to use the match_pathspec() used in
git-ls-files, which knows about glob patterns.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---
[SORRY FOR A RESEND -- I screwed up the To: field of the previous message]
* Having two different behaviours of pathspec matching has been
bothering me for quite some time. The changes here look trivially
correct and the result passes all the tests, but this is quite close
to the core part of the system, and would benefit greatly from extra
set of eyes.
This patch does not touch the tree walker, and does not affect
diff-tree nor ancestry pruning done in the revision traversal. That
however is even closer to the core and is performance critical. It
needs to be done carefully not to descend into trees that would never
match needlessly. IOW, not today.
dir.c | 5 +++--
read-cache.c | 17 ++---------------
2 files changed, 5 insertions(+), 17 deletions(-)
diff --git a/dir.c b/dir.c
index 225fdfb..be640c9 100644
--- a/dir.c
+++ b/dir.c
@@ -98,20 +98,21 @@ int match_pathspec(const char **pathspec, const char *name, int namelen, int pre
{
int retval;
const char *match;
+ int want_seen = !!seen;
name += prefix;
namelen -= prefix;
for (retval = 0; (match = *pathspec++) != NULL; seen++) {
int how;
- if (retval && *seen == MATCHED_EXACTLY)
+ if (retval && seen && want_seen && *seen == MATCHED_EXACTLY)
continue;
match += prefix;
how = match_one(match, name, namelen);
if (how) {
if (retval < how)
retval = how;
- if (*seen < how)
+ if (want_seen && *seen < how)
*seen = how;
}
}
diff --git a/read-cache.c b/read-cache.c
index 7db5588..767464e 100644
--- a/read-cache.c
+++ b/read-cache.c
@@ -472,7 +472,7 @@ 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;
+ const char *name;
int len;
if (!pathspec)
@@ -480,20 +480,7 @@ int ce_path_match(const struct cache_entry *ce, const char **pathspec)
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, name, len, 0, NULL);
}
/*
next reply other threads:[~2007-11-25 20:35 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-11-25 20:35 Junio C Hamano [this message]
2007-11-26 19:56 ` [RFC/PATCH] Making ce_path_match() more useful by accepting globs Alex Riesen
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=7vsl2ujc6x.fsf@gitster.siamese.dyndns.org \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=torvalds@linux-foundation.org \
/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).