proxmox-mirrors/libgit2
1
0
Fork 0
mirror of https://git.proxmox.com/git/libgit2 synced 2025-05-09 18:22:16 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #2320 from libgit2/rb/fix-starstar-again

Browse Source 
Make ** pattern eat trailing slash
This commit is contained in:
Vicent Marti 2014-05-02 03:36:22 -07:00
commit 644592bc73
2 changed files with 20 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/fnmatch.c
View File

@ -62,6 +62,8 @@ p_fnmatchx(const char *pattern, const char *string, int flags, size_t recurs)
flags &= ~FNM_PATHNAME; flags &= ~FNM_PATHNAME;
while (c == '*') while (c == '*')
c = *++pattern; c = *++pattern;
if (c == '/')
c = *++pattern;
} }
if (*string == '.' && (flags & FNM_PERIOD) && if (*string == '.' && (flags & FNM_PERIOD) &&

18
tests/attr/ignore.c
View File

@ -81,6 +81,24 @@ void test_attr_ignore__full_paths(void)
assert_is_ignored(false, "Folder/Middle/More/More/Contained/Not/Happy/Child"); assert_is_ignored(false, "Folder/Middle/More/More/Contained/Not/Happy/Child");
} }
void test_attr_ignore__more_starstar_cases(void)
{
cl_must_pass(p_unlink("attr/.gitignore"));
cl_git_mkfile(
"attr/dir/.gitignore",
"sub/**/*.html\n");
assert_is_ignored(false, "aaa.html");
assert_is_ignored(false, "dir");
assert_is_ignored(false, "dir/sub");
assert_is_ignored(true, "dir/sub/sub2/aaa.html");
assert_is_ignored(true, "dir/sub/aaa.html");
assert_is_ignored(false, "dir/aaa.html");
assert_is_ignored(false, "sub");
assert_is_ignored(false, "sub/aaa.html");
assert_is_ignored(false, "sub/sub2/aaa.html");
}
void test_attr_ignore__leading_stars(void) void test_attr_ignore__leading_stars(void)
{ {
cl_git_rewritefile( cl_git_rewritefile(