Robot
/
watchexec
mirror of https://github.com/watchexec/watchexec.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix gitignore searching not terminating in some cases; closes #25

This commit is contained in:
Matt Green 2016-11-08 17:52:15 -05:00
parent c416c6082c
commit 0d85d8275a
1 changed files with 18 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/main.rs
View File

@ -39,21 +39,27 @@ use notification_filter::NotificationFilter;
use process::{Process, ProcessReaper};
use watcher::{Event, Watcher};
// Starting at the specified path, search for gitignore files,
// stopping at the first one found.
fn find_gitignore_file(path: &Path) -> Option<PathBuf> {
let mut gitignore_path = path.join(".gitignore");
if gitignore_path.exists() {
return Some(gitignore_path);
}
fn find_gitignore(path: &Path) -> Option<PathBuf> {
let mut p = path.to_owned();
let p = path.to_owned();
while let Some(p) = p.parent() {
gitignore_path = p.join(".gitignore");
loop {
let gitignore_path = p.join(".gitignore");
if gitignore_path.exists() {
return Some(gitignore_path);
}
// Stop if we see a .git directory
if let Ok(metadata) = p.join(".git").metadata() {
if metadata.is_dir() {
break;
}
}
if p.parent().is_none() {
break;
}
p.pop();
}
None
@ -85,7 +91,7 @@ fn main() {
let mut gitignore_file = None;
if !args.no_vcs_ignore {
if let Some(gitignore_path) = find_gitignore_file(&cwd) {
if let Some(gitignore_path) = find_gitignore(&cwd) {
debug!("Found .gitignore file: {:?}", gitignore_path);
gitignore_file = gitignore::parse(&gitignore_path).ok();