From: Jeff King <peff@peff.net>
Date: Thu, 28 Mar 2013 21:47:47 +0000 (-0400)
Subject: dir.c::match_pathname(): adjust patternlen when shifting pattern
X-Git-Tag: v1.8.1.6~1^2~2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=982ac87316a1cf5126888157bdcbfa32268ebe47;p=git

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>
---

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--;
 	}