match_pathspec: match pathspec "foo/" against directory "foo"
Currently we do support matching pathspec "foo/" against directory "foo". That is because match_pathspec() has no way to tell "foo" is a directory and matching "foo/" against _file_ "foo" is wrong. The callers can now tell match_pathspec if "foo" is a directory, we could make an exception for this case. Code is not executed though because no callers pass the flag yet. Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Nguyễn Thái Ngọc Duy committed
Jan 24, 2014 at 20:40 UTC
68690fdd0b78762eb6387d7a437b588d15b6cf47
1 file changed
+6
-1
dir.c
+6
-1
@@ -196,6 +196,7 @@ int within_depth(const char *name, int namelen,
196
}
197
198
#define DO_MATCH_EXCLUDE 1
199
+#define DO_MATCH_DIRECTORY 2
200
201
/*
202
* Does 'match' match the given name?
@@ -259,7 +260,11 @@ static int match_pathspec_item(const struct pathspec_item *item, int prefix,
260
261
if (match[matchlen-1] == '/' || name[matchlen] == '/')
262
return MATCHED_RECURSIVELY;
262
- }
263
+ } else if ((flags & DO_MATCH_DIRECTORY) &&
264
+ match[matchlen - 1] == '/' &&
265
+ namelen == matchlen - 1 &&
266
+ !ps_strncmp(item, match, name, namelen))
267
+ return MATCHED_EXACTLY;
268
269
if (item->nowildcard_len < item->len &&
270
!git_fnmatch(item, match, name,