From edb456c32890f329bac59cba1286c0bf44ab6078 Mon Sep 17 00:00:00 2001 From: Philip Kelley Date: Mon, 8 Oct 2012 16:32:43 -0400 Subject: [PATCH] Fix a bug where ignorecase wasn't applied to ignores --- src/ignore.c | 9 +++++---- tests-clar/status/ignore.c | 21 +++++++++++++++++++++ 2 files changed, 26 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); } diff --git a/tests-clar/status/ignore.c b/tests-clar/status/ignore.c index 9092d5155..d18ba78fc 100644 --- a/tests-clar/status/ignore.c +++ b/tests-clar/status/ignore.c @@ -1,6 +1,7 @@ #include "clar_libgit2.h" #include "fileops.h" #include "git2/attr.h" +#include "ignore.h" #include "attr.h" #include "status_helpers.h" @@ -152,6 +153,26 @@ void test_status_ignore__ignore_pattern_contains_space(void) cl_assert(flags == GIT_STATUS_WT_NEW); } +void test_status_ignore__ignore_pattern_ignorecase(void) +{ + unsigned int flags; + const mode_t mode = 0777; + bool ignore_case; + git_index *index; + + g_repo = cl_git_sandbox_init("empty_standard_repo"); + cl_git_rewritefile("empty_standard_repo/.gitignore", "a.txt\n"); + + cl_git_mkfile("empty_standard_repo/A.txt", "Differs in case"); + + cl_git_pass(git_repository_index(&index, g_repo)); + ignore_case = index->ignore_case; + git_index_free(index); + + cl_git_pass(git_status_file(&flags, g_repo, "A.txt")); + cl_assert(flags == ignore_case ? GIT_STATUS_IGNORED : GIT_STATUS_WT_NEW); +} + void test_status_ignore__adding_internal_ignores(void) { int ignored;