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

Merge pull request #841 from ariasuni/dont-aggregate-git-ignored-status

Browse Source 
Fix --git deducing ignored state in unintuitive way
This commit is contained in:
Benjamin Sago 2021-04-09 23:12:37 +01:00 committed by GitHub
commit 6403336028
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -252,15 +252,21 @@ impl Git {
.unwrap_or_default() .unwrap_or_default()
} }
/// Get the combined status for all the files whose paths begin with the /// Get the combined, user-facing status of a file or directory.
/// path that gets passed in. This is used for getting the status of /// Statuses are aggregating (for example, a directory is considered
/// directories, which don’t really have an ‘official’ status. /// modified if any file under it has the status modified), except
/// for ignored which applies to files under (for example, a file is
/// considered ignored if one of its parent directories is ignored)
fn dir_status(&self, dir: &Path) -> f::Git { fn dir_status(&self, dir: &Path) -> f::Git {
let path = reorient(dir); let path = reorient(dir);
let s = self.statuses.iter() let s = self.statuses.iter()
.filter(|p| p.0.starts_with(&path)) .filter(|p| if p.1 == git2::Status::IGNORED {
.fold(git2::Status::empty(), |a, b| a | b.1); path.starts_with(&p.0)
} else {
p.0.starts_with(&path)
})
.fold(git2::Status::empty(), |a, b| a | b.1);
let staged = index_status(s); let staged = index_status(s);
let unstaged = working_tree_status(s); let unstaged = working_tree_status(s);