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

Merge branch 'cmn/ignore-dir-check'

Browse Source
This commit is contained in:
Carlos Martín Nieto 2015-09-13 06:21:18 +02:00
commit 1e80bf27ea
2 changed files with 26 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/ignore.c
View File

@ -89,18 +89,20 @@ static int does_negate_rule(int *out, git_vector *rules, git_attr_fnmatch *match
} }
/* /*
* If we're dealing with a directory (which we know via the * When dealing with a directory, we add '/<star>' so
* strchr() check) we want to use 'dirname/<star>' as the * p_fnmatch() honours FNM_PATHNAME. Checking for LEADINGDIR
* pattern so p_fnmatch() honours FNM_PATHNAME * alone isn't enough as that's also set for nagations, so we
* need to check that NEGATIVE is off.
*/ */
git_buf_clear(&buf); git_buf_clear(&buf);
if (rule->containing_dir) { if (rule->containing_dir) {
git_buf_puts(&buf, rule->containing_dir); git_buf_puts(&buf, rule->containing_dir);
} }
if (!strchr(rule->pattern, '*'))
error = git_buf_printf(&buf, "%s/*", rule->pattern); error = git_buf_puts(&buf, rule->pattern);
else
error = git_buf_puts(&buf, rule->pattern); if ((rule->flags & (GIT_ATTR_FNMATCH_LEADINGDIR | GIT_ATTR_FNMATCH_NEGATIVE)) == GIT_ATTR_FNMATCH_LEADINGDIR)
error = git_buf_PUTS(&buf, "/*");
if (error < 0) if (error < 0)
goto out; goto out;

17
tests/status/ignore.c
View File

@ -1022,3 +1022,20 @@ void test_status_ignore__negate_exact_previous(void)
cl_git_pass(git_ignore_path_is_ignored(&ignored, g_repo, ".buildpath")); cl_git_pass(git_ignore_path_is_ignored(&ignored, g_repo, ".buildpath"));
cl_assert_equal_i(1, ignored); cl_assert_equal_i(1, ignored);
} }
void test_status_ignore__negate_starstar(void)
{
int ignored;
g_repo = cl_git_sandbox_init("empty_standard_repo");
cl_git_mkfile("empty_standard_repo/.gitignore",
"code/projects/**/packages/*\n"
"!code/projects/**/packages/repositories.config");
cl_git_pass(git_futils_mkdir_r("code/projects/foo/bar/packages", "empty_standard_repo", 0777));
cl_git_mkfile("empty_standard_repo/code/projects/foo/bar/packages/repositories.config", "");
cl_git_pass(git_ignore_path_is_ignored(&ignored, g_repo, "code/projects/foo/bar/packages/repositories.config"));
cl_assert_equal_i(0, ignored);
}