undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Convert ce_path_match() to use match_pathspec_depth()

Browse Source 
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Nguyễn Thái Ngọc Duy 2010-12-15 22:02:50 +07:00 committed by Junio C Hamano
parent eb9cb55b94
commit 898bbd9fb4
1 changed files with 1 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
read-cache.c
View File

@ -708,29 +708,7 @@ int ce_same_name(struct cache_entry *a, struct cache_entry *b)
int ce_path_match(const struct cache_entry *ce, const struct pathspec *pathspec) int ce_path_match(const struct cache_entry *ce, const struct pathspec *pathspec)
{ {
const char *match, *name; return match_pathspec_depth(pathspec, ce->name, ce_namelen(ce), 0, NULL);
const char **ps = pathspec->raw;
int len;
if (!pathspec->nr)
return 1;
len = ce_namelen(ce);
name = ce->name;
while ((match = *ps++) != 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;
} }
/* /*