Skip to content

Commit

Permalink
Strip trailing whitespace in gitignore patterns.
Browse files Browse the repository at this point in the history
Fixes #38.
  • Loading branch information
BurntSushi committed Sep 25, 2016
1 parent 37b731a commit 4b5e789
Showing 1 changed file with 4 additions and 0 deletions.
4 changes: 4 additions & 0 deletions src/gitignore.rs
Original file line number Diff line number Diff line change
Expand Up @@ -279,6 +279,9 @@ impl GitignoreBuilder {
if line.is_empty() || line.starts_with("#") {
return Ok(());
}
if !line.ends_with("\\ ") {
line = line.trim_right();
}
let mut pat = Pattern {
from: from.as_ref().to_path_buf(),
original: line.to_string(),
Expand Down Expand Up @@ -401,6 +404,7 @@ mod tests {
ignored!(ig27, ROOT, "foo/", "xyz/foo", true);
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);

not_ignored!(ignot1, ROOT, "amonths", "months");
not_ignored!(ignot2, ROOT, "monthsa", "months");
Expand Down

0 comments on commit 4b5e789

Please sign in to comment.