summaryrefslogtreecommitdiff
path: root/src/ignore.c
diff options
context:
space:
mode:
authorPhilip Kelley <phkelley@hotmail.com>2012-10-08 16:32:43 -0400
committerPhilip Kelley <phkelley@hotmail.com>2012-10-08 16:32:43 -0400
commitedb456c32890f329bac59cba1286c0bf44ab6078 (patch)
treeb8c93b6cd333290a899363e58f6bccd2ad30471c /src/ignore.c
parentacd1700630ea1159a55dc5e8cee12e4a725afe18 (diff)
downloadlibgit2-edb456c32890f329bac59cba1286c0bf44ab6078.tar.gz
Fix a bug where ignorecase wasn't applied to ignores
Diffstat (limited to 'src/ignore.c')
-rw-r--r--src/ignore.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/src/ignore.c b/src/ignore.c
index c562f4e43..e711be206 100644
--- a/src/ignore.c
+++ b/src/ignore.c
@@ -48,13 +48,14 @@ static int parse_ignore_file(
match->flags = GIT_ATTR_FNMATCH_ALLOWSPACE;
- if (ignore_case)
- match->flags |= GIT_ATTR_FNMATCH_ICASE;
-
if (!(error = git_attr_fnmatch__parse(
match, ignores->pool, context, &scan)))
{
- match->flags = match->flags | GIT_ATTR_FNMATCH_IGNORE;
+ match->flags |= GIT_ATTR_FNMATCH_IGNORE;
+
+ if (ignore_case)
+ match->flags |= GIT_ATTR_FNMATCH_ICASE;
+
scan = git__next_line(scan);
error = git_vector_insert(&ignores->rules, match);
}