zed-industries/zed
1
1
Fork 0
mirror of https://github.com/zed-industries/zed.git synced 2024-11-07 20:39:04 +03:00
Code Issues Packages Projects Releases Wiki Activity

Add index tracking to status

Browse Source
This commit is contained in:
Mikayla Maki 2023-05-15 12:00:12 -07:00
parent 6c26f3d0e4
commit 1e4ab6cd75
No known key found for this signature in database
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -100,9 +100,9 @@ impl GitRepository for LibGitRepository {
fn read_status(status: git2::Status) -> Option<GitFileStatus> { fn read_status(status: git2::Status) -> Option<GitFileStatus> {
if status.contains(git2::Status::CONFLICTED) { if status.contains(git2::Status::CONFLICTED) {
Some(GitFileStatus::Conflict) Some(GitFileStatus::Conflict)
} else if status.intersects(git2::Status::WT_MODIFIED | git2::Status::WT_RENAMED) { } else if status.intersects(git2::Status::WT_MODIFIED | git2::Status::WT_RENAMED | git2::Status::INDEX_MODIFIED | git2::Status::INDEX_RENAMED) {
Some(GitFileStatus::Modified) Some(GitFileStatus::Modified)
} else if status.intersects(git2::Status::WT_NEW) { } else if status.intersects(git2::Status::WT_NEW | git2::Status::INDEX_NEW) {
Some(GitFileStatus::Added) Some(GitFileStatus::Added)
} else { } else {
None None