mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

pathspec: fix pathspecs with '/' at the end

Browse Source 
Removing (and ignoring) them is wrong, since that means
that a pathspec of "xxxx/" would match a regular filename
of "xxxx", which is obviously incorrect.
This commit is contained in:
Linus Torvalds
2005-05-31 15:17:58 -07:00
parent 381ca9a3bc
commit 1d9e6f92bc
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
diffcore-pathspec.c
View File

@ -21,9 +21,13 @@ static int matches_pathspec(const char *name, struct path_spec *s, int cnt)
namelen = strlen(name); namelen = strlen(name);
for (i = 0; i < cnt; i++) { for (i = 0; i < cnt; i++) {
int len = s[i].len; int len = s[i].len;
if (! strncmp(s[i].spec, name, len) && if (namelen < len)
len <= namelen && continue;
(name[len] == 0 || name[len] == '/')) if (memcmp(s[i].spec, name, len))
continue;
if (s[i].spec[len-1] == '/' ||
name[len] == 0 ||
name[len] == '/')
return 1; return 1;
} }
return 0; return 0;
@ -44,12 +48,8 @@ void diffcore_pathspec(const char **pathspec)
speccnt = i; speccnt = i;
spec = xmalloc(sizeof(*spec) * speccnt); spec = xmalloc(sizeof(*spec) * speccnt);
for (i = 0; pathspec[i]; i++) { for (i = 0; pathspec[i]; i++) {
int l;
spec[i].spec = pathspec[i]; spec[i].spec = pathspec[i];
l = strlen(pathspec[i]); spec[i].len = strlen(pathspec[i]);
while (l > 0 && pathspec[i][l-1] == '/')
l--;
spec[i].len = l;
} }
for (i = 0; i < q->nr; i++) { for (i = 0; i < q->nr; i++) {