update dependencies and rust version

2 files changed, 12 insertions, 9 deletions

diff --git a/src/repo/git/checkout.rs b/src/repo/git/checkout.rs
index a36b152..d4a9ced 100644
--- a/src/repo/git/checkout.rs
+++ b/src/repo/git/checkout.rs
@@ -6,6 +6,7 @@ use gix::{
     Progress,
 };
 
+use gix::validate::path::component::Options;
 use gix_index::{File, State};
 use tracing::debug;
 
@@ -27,7 +28,8 @@ impl Repo {
             .context("failed to peel HEAD object")?
             .id();
 
-        let index = State::from_tree(&head_tree, &repo.objects).context("index from tree")?;
+        let index = State::from_tree(&head_tree, &repo.objects, Options::default())
+            .context("index from tree")?;
         let mut index = File::from_state(index, repo.index_path());
 
         let mut files =
diff --git a/src/repo/git/mod.rs b/src/repo/git/mod.rs
index 7513ca5..65f4022 100644
--- a/src/repo/git/mod.rs
+++ b/src/repo/git/mod.rs
@@ -12,8 +12,8 @@ use gix::{
 use tracing::debug;
 
 mod checkout;
-mod ffmerge;
 mod fetch;
+mod ffmerge;
 
 impl Repo {
     #[tracing::instrument(level = "debug")]
@@ -73,7 +73,7 @@ impl Repo {
                     message: message.into(),
                 },
                 expected: PreviousValue::Any,
-                new: gix::refs::Target::Peeled(target),
+                new: gix::refs::Target::Object(target),
             },
             name: FullName::try_from(name).unwrap(),
             deref: true,
@@ -90,12 +90,13 @@ impl Repo {
 
         let repo = self.repo()?;
 
-        let edits = repo.edit_reference(Repo::refedit(
-            head.into(),
-            &format!("refs/heads/{}", default_branch),
-            &format!("checkout: {}/HEAD with gtree", remote.as_bstr()),
-        ))
-        .context("checkout: failed to edit ref")?;
+        let edits = repo
+            .edit_reference(Repo::refedit(
+                head.into(),
+                &format!("refs/heads/{}", default_branch),
+                &format!("checkout: {}/HEAD with gtree", remote.as_bstr()),
+            ))
+            .context("checkout: failed to edit ref")?;
 
         debug!("ref edits: {:?}", edits);