summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeff King <peff@peff.net>2013-03-28 17:47:47 -0400
committerJunio C Hamano <gitster@pobox.com>2013-03-28 21:48:18 -0700
commit982ac87316a1cf5126888157bdcbfa32268ebe47 (patch)
tree1daa4ad6b365f93117c1d6423e062731f988a283
parent0b6e56dfe6c7f75c2a02cc0cf8731c9e62b6d3d1 (diff)
downloadgit-982ac87316a1cf5126888157bdcbfa32268ebe47.tar.gz
dir.c::match_pathname(): adjust patternlen when shifting pattern
If we receive a pattern that starts with "/", we shift it forward to avoid looking at the "/" part. Since the prefix and patternlen parameters are counts of what is in the pattern, we must decrement them as we increment the pointer. We remembered to handle prefix, but not patternlen. This didn't cause any bugs, though, because the patternlen parameter is not actually used. Since it will be used in future patches, let's correct this oversight. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rw-r--r--dir.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/dir.c b/dir.c
index 0db79f9cf6..1757a3f4e0 100644
--- a/dir.c
+++ b/dir.c
@@ -597,6 +597,7 @@ int match_pathname(const char *pathname, int pathlen,
*/
if (*pattern == '/') {
pattern++;
+ patternlen--;
prefix--;
}