Skip to content

Commit 6f6340a

Browse files
committed
ignore: fix determining whether a shorter pattern negates another
When computing whether we need to store a negative pattern, we iterate through all previously known patterns and check whether the negative pattern undoes any of the previous ones. In doing so we call `wildmatch` and check it's return for any negative error values. If there was a negative return, we will abort and bubble up that error to the caller. In fact, this check for negative values stems from the time where we still used `fnmatch` instead of `wildmatch`. For `fnmatch`, negative values indicate a "real" error, while for `wildmatch` a negative value may be returned if the matching was prematurely aborted. A premature abort may for example also happen if the pattern matches a prefix of the haystack if the pattern is shorter. Returning an error in that case is the wrong thing to do. Fix the code to compare for equality with `WM_MATCH`, only. Negative values returned by `wildmatch` are perfectly fine and thus should be ignored. Add a test that verifies we do not see the error.
1 parent 368b979 commit 6f6340a

File tree

2 files changed

+16
-6
lines changed

2 files changed

+16
-6
lines changed

src/ignore.c

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -141,13 +141,8 @@ static int does_negate_rule(int *out, git_vector *rules, git_attr_fnmatch *match
141141
if (git_buf_oom(&buf))
142142
goto out;
143143

144-
if ((error = wildmatch(git_buf_cstr(&buf), path, wildmatch_flags)) < 0) {
145-
git_error_set(GIT_ERROR_INVALID, "error matching pattern");
146-
goto out;
147-
}
148-
149144
/* if we found a match, we want to keep this rule */
150-
if (error != WM_NOMATCH) {
145+
if ((wildmatch(git_buf_cstr(&buf), path, wildmatch_flags)) == WM_MATCH) {
151146
*out = 1;
152147
error = 0;
153148
goto out;

tests/ignore/path.c

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -560,3 +560,18 @@ void test_ignore_path__escaped_space(void)
560560
assert_is_ignored(false, "bar\\\\\\");
561561
assert_is_ignored(false, "bar\\\\\\ ");
562562
}
563+
564+
void test_ignore_path__invalid_pattern(void)
565+
{
566+
cl_git_rewritefile("attr/.gitignore", "[");
567+
assert_is_ignored(false, "[f");
568+
assert_is_ignored(false, "f");
569+
}
570+
571+
void test_ignore_path__negative_prefix_rule(void)
572+
{
573+
cl_git_rewritefile("attr/.gitignore", "ff*\n!f\n");
574+
assert_is_ignored(true, "fff");
575+
assert_is_ignored(true, "ff");
576+
assert_is_ignored(false, "f");
577+
}

0 commit comments

Comments
 (0)