Update gix to 0.56

EmbarkStudios · Dec 12, 2023 · 60fd14e · 60fd14e
1 parent b1af2b8
commit 60fd14e
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git 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
@@ -412,7 +412,7 @@ pub enum GitError {
     #[error(transparent)]
     ReferenceLookup(#[from] Box<gix::reference::find::existing::Error>),
     #[error(transparent)]
-    BlobLookup(#[from] Box<gix::odb::find::existing::Error>),
+    BlobLookup(#[from] Box<gix::object::find::existing::Error>),
     #[error(transparent)]
     RemoteLookup(#[from] Box<gix::remote::find::existing::Error>),
     #[error(transparent)]

diff --git 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,15 +94,15 @@ impl TreeUpdateBuilder {
             match entry {
                 UpdateEntry::Blob(oid) => {
                     nt.entries.push(Entry {
-                        mode: EntryMode::Blob,
+                        mode: EntryKind::Blob.into(),
                         oid,
                         filename,
                     });
                 }
                 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, &current_tree, repo);
                     nt.entries.push(Entry {
-                        mode: EntryMode::Tree,
+                        mode: EntryKind::Tree.into(),
                         oid,
                         filename,
                     });