Match against file with leading ! was too broad

b7b77def · Russell Belfer · 4ba64794 · b7b77def
Commit b7b77def authored Aug 09, 2013 by Russell Belfer
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 1 deletions

src/pathspec.c
+2 -1

No files found.
--- a/src/pathspec.c
+++ b/src/pathspec.c
@@ -166,7 +166,8 @@ static int pathspec_match_one(
 	if (result == FNM_NOMATCH &&
 		(match->flags & GIT_ATTR_FNMATCH_NEGATIVE) != 0 &&
 		*path == '!' &&
-		ctxt->strncomp(path + 1, match->pattern, match->length) == 0)
+		ctxt->strncomp(path + 1, match->pattern, match->length) == 0 &&
+		(!path[match->length + 1] || path[match->length + 1] == '/'))
 		return 1;

 	if (result == 0)