Llewellyn/exa
1
0
Fork 0
mirror of https://github.com/Llewellynvdm/exa.git synced 2024-11-26 13:56:27 +00:00
Code Issues Projects Releases Wiki Activity

fixed git status not working in directories containing '../'

Browse Source
This commit is contained in:
Lukas Rysavy 2018-04-13 22:23:46 +02:00
parent 63a1035158
commit 2fc56d45ca
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/fs/feature/git.rs
View File

@ -53,7 +53,7 @@ impl FromIterator<PathBuf> for GitCache {
else { else {
match GitRepo::discover(path) { match GitRepo::discover(path) {
Ok(r) => { Ok(r) => {
if let Some(mut r2) = git.repos.iter_mut().find(|e| e.has_workdir(&r.workdir)) { if let Some(r2) = git.repos.iter_mut().find(|e| e.has_workdir(&r.workdir)) {
debug!("Adding to existing repo (workdir matches with {:?})", r2.workdir); debug!("Adding to existing repo (workdir matches with {:?})", r2.workdir);
r2.extra_paths.push(r.original_path); r2.extra_paths.push(r.original_path);
continue; continue;
@ -268,7 +268,8 @@ fn reorient(path: &Path) -> PathBuf {
match current_dir() { match current_dir() {
Err(_) => Path::new(".").join(&path), Err(_) => Path::new(".").join(&path),
Ok(dir) => dir.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. /// The character to display if the file has been modified, but not staged.