rust/ripgrep
1
0
Fork 0
mirror of https://github.com/BurntSushi/ripgrep.git synced 2024-12-12 19:18:24 +02:00
Code Issues Releases Activity

ignore/gitignore: Skip BOM at start of ignore file

Browse Source 
Match Git's behavior.
Fixes #2177.
This commit is contained in:
Stephen Albert-Moore 2024-04-17 16:58:23 -04:00
parent d922b7ac11
commit 4ab99abb97
3 changed files with 22 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
crates/ignore/src/gitignore.rs
View File

@ -401,6 +401,12 @@ impl GitignoreBuilder {
break;
}
};
// Match Git's handling of .gitignore files that begin with the Unicode BOM
const UTF8_BOM: &str = "\u{feff}";
let line =
if i == 0 { line.trim_start_matches(UTF8_BOM) } else { &line };
if let Err(err) = self.add_line(Some(path.to_path_buf()), &line) {
errs.push(err.tagged(path, lineno));
}

2
crates/ignore/tests/gitignore_skip_bom.gitignore Normal file
View File

@ -0,0 +1,2 @@
ignore/this/path
# This file begins with a BOM (U+FEFF)

14
crates/ignore/tests/gitignore_skip_bom.rs Normal file
View File

@ -0,0 +1,14 @@
use ignore::gitignore::GitignoreBuilder;
const IGNORE_FILE: &'static str = "tests/gitignore_skip_bom.gitignore";
/// Skip a Byte-Order Mark (BOM) at the beginning of the file, matching Git's behavior.
#[test]
fn gitignore_skip_bom() {
let mut builder = GitignoreBuilder::new("ROOT");
let error = builder.add(IGNORE_FILE);
assert!(error.is_none(), "failed to open gitignore file");
let g = builder.build().unwrap();
assert!(g.matched("ignore/this/path", false).is_ignore());
}