summaryrefslogtreecommitdiff
path: root/read-cache.c
diff options
context:
space:
mode:
authorNguyễn Thái Ngọc Duy <pclouds@gmail.com>2010-12-17 12:43:07 (GMT)
committerJunio C Hamano <gitster@pobox.com>2011-02-03 22:08:30 (GMT)
commiteb9cb55b944796374402ab4e2639300dc9b0b409 (patch)
treef240f3713f75d196a320b19f3ace7c570fec6cd4 /read-cache.c
parentafe069d16618190a6f7e84ef8451970e274aedb4 (diff)
downloadgit-eb9cb55b944796374402ab4e2639300dc9b0b409.zip
git-eb9cb55b944796374402ab4e2639300dc9b0b409.tar.gz
git-eb9cb55b944796374402ab4e2639300dc9b0b409.tar.bz2
Convert ce_path_match() to use struct pathspec
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'read-cache.c')
-rw-r--r--read-cache.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/read-cache.c b/read-cache.c
index 4f2e890..8b2d537 100644
--- a/read-cache.c
+++ b/read-cache.c
@@ -706,17 +706,18 @@ int ce_same_name(struct cache_entry *a, struct cache_entry *b)
return ce_namelen(b) == len && !memcmp(a->name, b->name, len);
}
-int ce_path_match(const struct cache_entry *ce, const char **pathspec)
+int ce_path_match(const struct cache_entry *ce, const struct pathspec *pathspec)
{
const char *match, *name;
+ const char **ps = pathspec->raw;
int len;
- if (!pathspec)
+ if (!pathspec->nr)
return 1;
len = ce_namelen(ce);
name = ce->name;
- while ((match = *pathspec++) != NULL) {
+ while ((match = *ps++) != NULL) {
int matchlen = strlen(match);
if (matchlen > len)
continue;