From 8b9eba2147587d5c8a39708fdda6a1a3be032f9e Mon Sep 17 00:00:00 2001 From: Brian Campbell Date: Mon, 23 Oct 2017 22:52:01 -0400 Subject: [PATCH] Properly match the rules "**/" and "!**/" When processing a rule that ends in a slash, we strip it off and set the `is_only_dir` flag. We then apply the rule that paths that aren't absolute should be given an implicit `**/` prefix, while avoiding adding that prefix if it already exists. However, this means that we miss the case in which we had already stripped off the trailing slash and set `is_only_dir`. Correct this by also explicitly checking for that case. Fixes #649 --- ignore/src/gitignore.rs | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/ignore/src/gitignore.rs b/ignore/src/gitignore.rs index 85109559..3f87c940 100644 --- a/ignore/src/gitignore.rs +++ b/ignore/src/gitignore.rs @@ -455,7 +455,7 @@ impl GitignoreBuilder { // anywhere, so use a **/ prefix. if !is_absolute { // ... but only if we don't already have a **/ prefix. - if !glob.actual.starts_with("**/") { + if !(glob.actual.starts_with("**/") || (glob.actual == "**" && glob.is_only_dir)) { glob.actual = format!("**/{}", glob.actual); } } @@ -620,6 +620,7 @@ mod tests { ignored!(ig28, ROOT, "src/*.rs", "src/grep/src/main.rs"); ignored!(ig29, "./src", "/llvm/", "./src/llvm", true); ignored!(ig30, ROOT, "node_modules/ ", "node_modules", true); + ignored!(ig31, ROOT, "**/", "foo/bar", true); not_ignored!(ignot1, ROOT, "amonths", "months"); not_ignored!(ignot2, ROOT, "monthsa", "months"); @@ -638,6 +639,7 @@ mod tests { ignot14, "./third_party/protobuf", "m4/ltoptions.m4", "./third_party/protobuf/csharp/src/packages/repositories.config"); not_ignored!(ignot15, ROOT, "!/bar", "foo/bar"); + not_ignored!(ignot16, ROOT, "*\n!**/", "foo", true); fn bytes(s: &str) -> Vec { s.to_string().into_bytes()