diff --git a/Cargo.toml b/Cargo.toml index 0743e98..9217085 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -59,7 +59,7 @@ twox-hash = { version = "1.6", default-features = false } [dependencies.gix] optional = true -version = "0.55" +version = "0.56" default-features = false features = ["blocking-http-transport-reqwest"] diff --git a/src/index/git_remote.rs b/src/index/git_remote.rs index 5726c61..b21ce67 100644 --- a/src/index/git_remote.rs +++ b/src/index/git_remote.rs @@ -412,7 +412,7 @@ pub enum GitError { #[error(transparent)] ReferenceLookup(#[from] Box), #[error(transparent)] - BlobLookup(#[from] Box), + BlobLookup(#[from] Box), #[error(transparent)] RemoteLookup(#[from] Box), #[error(transparent)] diff --git a/tests/git.rs b/tests/git.rs index eb74313..be94214 100644 --- a/tests/git.rs +++ b/tests/git.rs @@ -80,7 +80,7 @@ impl TreeUpdateBuilder { repo: &gix::Repository, ) -> gix::ObjectId { use gix::objs::{ - tree::{Entry, EntryMode}, + tree::{Entry, EntryKind}, Tree, }; @@ -94,7 +94,7 @@ impl TreeUpdateBuilder { match entry { UpdateEntry::Blob(oid) => { nt.entries.push(Entry { - mode: EntryMode::Blob, + mode: EntryKind::Blob.into(), oid, filename, }); @@ -102,7 +102,7 @@ impl TreeUpdateBuilder { UpdateEntry::Tree(ut) => { // Check if there is already an existing tree let current_tree = tree_ref.entries.iter().find_map(|tre| { - if tre.filename == name && tre.mode == EntryMode::Tree { + if tre.filename == name && tre.mode.is_tree() { Some(repo.find_object(tre.oid).unwrap().into_tree()) } else { None @@ -112,7 +112,7 @@ impl TreeUpdateBuilder { let oid = Self::create_inner(ut, ¤t_tree, repo); nt.entries.push(Entry { - mode: EntryMode::Tree, + mode: EntryKind::Tree.into(), oid, filename, });