Skip to content

work around for windows path separator for is_path_ignored #335

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jul 21, 2018
Merged

work around for windows path separator for is_path_ignored #335

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c5daf28
work around for windows path separator for is_path_ignored
Eh2406 Jul 20, 2018
4de36b5
use cfg!
Eh2406 Jul 20, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 14 additions & 1 deletion src/repo.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2044,7 +2044,13 @@ impl Repository {

/// Test if the ignore rules apply to a given path.
pub fn is_path_ignored<P: AsRef<Path>>(&self, path: P) -> Result<bool, Error> {
let path = try!(path.as_ref().into_c_string());
let path = if cfg!(windows) {
// `git_ignore_path_is_ignored` dose not work with windows path separator
// so we convert \ to /
try!(::std::ffi::CString::new(path.as_ref().to_string_lossy().replace('\\', "/")))
} else {
try!(path.as_ref().into_c_string())
};
let mut ignored: c_int = 0;
unsafe {
try_call!(raw::git_ignore_path_is_ignored(&mut ignored, self.raw, path));
Expand Down Expand Up @@ -2536,8 +2542,15 @@ mod tests {

let _ = repo.add_ignore_rule("/foo");
assert!(repo.is_path_ignored(Path::new("/foo")).unwrap());
if cfg!(windows){
assert!(repo.is_path_ignored(Path::new("\\foo\\thing")).unwrap());
}


let _ = repo.clear_ignore_rules();
assert!(!repo.is_path_ignored(Path::new("/foo")).unwrap());
if cfg!(windows){
assert!(!repo.is_path_ignored(Path::new("\\foo\\thing")).unwrap());
}
}
}