From cfc17dc41b1ce251d72696b4168b3d6d77fc54ab Mon Sep 17 00:00:00 2001 From: Adam Roben Date: Sat, 9 Jun 2012 17:43:18 -0400 Subject: [PATCH 1/2] Add a test showing that git_status_file gets confused by spaces in .gitignore --- tests-clar/status/ignore.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/tests-clar/status/ignore.c b/tests-clar/status/ignore.c index 369b25bda..0384306c1 100644 --- a/tests-clar/status/ignore.c +++ b/tests-clar/status/ignore.c @@ -131,3 +131,17 @@ void test_status_ignore__empty_repo_with_gitignore_rewrite(void) cl_assert(ignored); } +void test_status_ignore__ignore_pattern_contains_space(void) +{ + unsigned int flags; + const mode_t mode = 0777; + + g_repo = cl_git_sandbox_init("empty_standard_repo"); + cl_git_rewritefile("empty_standard_repo/.gitignore", "foo bar.txt\n"); + + cl_git_pass(git_futils_mkdir_r("empty_standard_repo/foo", NULL, mode)); + cl_git_mkfile("empty_standard_repo/foo/look-ma.txt", "I'm not going to be ignored!"); + + cl_git_pass(git_status_file(&flags, g_repo, "foo/look-ma.txt")); + cl_assert(flags == GIT_STATUS_WT_NEW); +} From 9939e602d8aaffcc65e2db54ff670c8fa888299c Mon Sep 17 00:00:00 2001 From: Russell Belfer Date: Mon, 11 Jun 2012 09:24:02 -0700 Subject: [PATCH 2/2] Ignores allow unescapes internal whitespace --- src/ignore.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/ignore.c b/src/ignore.c index fc6194bb5..f2d08f59e 100644 --- a/src/ignore.c +++ b/src/ignore.c @@ -28,6 +28,8 @@ static int parse_ignore_file( GITERR_CHECK_ALLOC(match); } + match->flags = GIT_ATTR_FNMATCH_ALLOWSPACE; + if (!(error = git_attr_fnmatch__parse( match, ignores->pool, context, &scan))) {