diff options
Diffstat (limited to 'helix-vcs')
| -rw-r--r-- | helix-vcs/Cargo.toml | 2 | ||||
| -rw-r--r-- | helix-vcs/src/git.rs | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/helix-vcs/Cargo.toml b/helix-vcs/Cargo.toml index ba38160f..bdf4b54d 100644 --- a/helix-vcs/Cargo.toml +++ b/helix-vcs/Cargo.toml @@ -19,7 +19,7 @@ tokio = { version = "1", features = ["rt", "rt-multi-thread", "time", "sync", "p parking_lot = "0.12" arc-swap = { version = "1.6.0" } -gix = { version = "0.55.0", default-features = false , optional = true } +gix = { version = "0.56.0", default-features = false , optional = true } imara-diff = "0.1.5" anyhow = "1" diff --git a/helix-vcs/src/git.rs b/helix-vcs/src/git.rs index 88dba70c..e4d45301 100644 --- a/helix-vcs/src/git.rs +++ b/helix-vcs/src/git.rs @@ -3,7 +3,7 @@ use arc_swap::ArcSwap; use std::path::Path; use std::sync::Arc; -use gix::objs::tree::EntryMode; +use gix::objs::tree::EntryKind; use gix::sec::trust::DefaultForLevel; use gix::{Commit, ObjectId, Repository, ThreadSafeRepository}; @@ -128,12 +128,12 @@ fn find_file_in_commit(repo: &Repository, commit: &Commit, file: &Path) -> Resul let tree_entry = tree .lookup_entry_by_path(rel_path, &mut Vec::new())? .context("file is untracked")?; - match tree_entry.mode() { + match tree_entry.mode().kind() { // not a file, everything is new, do not show diff - mode @ (EntryMode::Tree | EntryMode::Commit | EntryMode::Link) => { + mode @ (EntryKind::Tree | EntryKind::Commit | EntryKind::Link) => { bail!("entry at {} is not a file but a {mode:?}", file.display()) } // found a file - EntryMode::Blob | EntryMode::BlobExecutable => Ok(tree_entry.object_id()), + EntryKind::Blob | EntryKind::BlobExecutable => Ok(tree_entry.object_id()), } } |