Merge pull request ogham#378 from LlinksRechts/master

ogham · web-flow · commit f1a5b646fe30 · 2019-07-15T04:00:11.000+01:00
fixed git status not working in directories containing '../'
diff --git a/src/fs/feature/git.rs b/src/fs/feature/git.rs
@@ -268,7 +268,8 @@ fn reorient(path: &Path) -> PathBuf {
     match current_dir() {
         Err(_)  => Path::new(".").join(&path),
         Ok(dir) => dir.join(&path),
-    }
+    }.canonicalize().unwrap()   // errors can be ignored here because they only occur if
+                                // the path does not exist / a component is not a folder
 }
 
 /// The character to display if the file has been modified, but not staged.

Original file line number	Diff line number	Diff line change
`@@ -268,7 +268,8 @@ fn reorient(path: &Path) -> PathBuf {`
`268`	`268`	`match current_dir() {`
`269`	`269`	`Err(_) => Path::new(".").join(&path),`
`270`	`270`	`Ok(dir) => dir.join(&path),`
`271`		`- }`
	`271`	`+ }.canonicalize().unwrap() // errors can be ignored here because they only occur if`
	`272`	`+ // the path does not exist / a component is not a folder`
`272`	`273`	`}`
`273`	`274`
`274`	`275`	`/// The character to display if the file has been modified, but not staged.`