zed-industries/zed
1
1
Fork 0
mirror of https://github.com/zed-industries/zed.git synced 2024-12-29 07:52:19 +03:00
Code Issues Packages Projects Releases Wiki Activity

Fix filtering of staged statuses

Browse Source
This commit is contained in:
Max Brunsfeld 2023-07-22 17:53:58 -07:00
parent b338ffe8d8
commit a3a9d024ba
1 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
crates/fs/src/repository.rs
View File

@ -101,18 +101,17 @@ impl GitRepository for LibGitRepository {
let mut options = git2::StatusOptions::new(); let mut options = git2::StatusOptions::new();
options.pathspec(path_prefix); options.pathspec(path_prefix);
options.disable_pathspec_match(true); options.disable_pathspec_match(true);
options.show(StatusShow::Index);
if let Some(statuses) = self.statuses(Some(&mut options)).log_err() { if let Some(statuses) = self.statuses(Some(&mut options)).log_err() {
for status in statuses for status in statuses.iter() {
.iter()
.filter(|status| !status.status().contains(git2::Status::IGNORED))
{
let path = RepoPath(PathBuf::from(OsStr::from_bytes(status.path_bytes()))); let path = RepoPath(PathBuf::from(OsStr::from_bytes(status.path_bytes())));
let Some(status) = read_status(status.status()) else { let status = status.status();
continue if !status.contains(git2::Status::IGNORED) {
}; if let Some(status) = read_status(status) {
map.insert(path, status)
map.insert(path, status) }
}
} }
} }
map map