diff options
| author | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-05-31 15:17:58 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-05-31 15:17:58 -0700 |
| commit | 1d9e6f92bc6a1a1a37d187db72dcc02642ba04f6 (patch) | |
| tree | 22a7fb79d793980a84b4c7c50a0a8e9496ba2369 /diffcore-pathspec.c | |
| parent | 381ca9a3bcfb6eae40340ecd683b189fd5781f14 (diff) | |
| download | git-1d9e6f92bc6a1a1a37d187db72dcc02642ba04f6.tar.gz git-1d9e6f92bc6a1a1a37d187db72dcc02642ba04f6.tar.xz | |
pathspec: fix pathspecs with '/' at the end
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.
Diffstat (limited to 'diffcore-pathspec.c')
| -rw-r--r-- | diffcore-pathspec.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/diffcore-pathspec.c b/diffcore-pathspec.c index 7f18a6ca3..a48acbc96 100644 --- a/diffcore-pathspec.c +++ b/diffcore-pathspec.c @@ -21,9 +21,13 @@ static int matches_pathspec(const char *name, struct path_spec *s, int cnt) namelen = strlen(name); for (i = 0; i < cnt; i++) { int len = s[i].len; - if (! strncmp(s[i].spec, name, len) && - len <= namelen && - (name[len] == 0 || name[len] == '/')) + if (namelen < len) + continue; + if (memcmp(s[i].spec, name, len)) + continue; + if (s[i].spec[len-1] == '/' || + name[len] == 0 || + name[len] == '/') return 1; } return 0; @@ -44,12 +48,8 @@ void diffcore_pathspec(const char **pathspec) speccnt = i; spec = xmalloc(sizeof(*spec) * speccnt); for (i = 0; pathspec[i]; i++) { - int l; spec[i].spec = pathspec[i]; - l = strlen(pathspec[i]); - while (l > 0 && pathspec[i][l-1] == '/') - l--; - spec[i].len = l; + spec[i].len = strlen(pathspec[i]); } for (i = 0; i < q->nr; i++) { |