3 files changed, 3 insertions, 36 deletions

diff --git a/src/repo/git/checkout.rs b/src/repo/git/checkout.rs
index 44879a6..87c63c1 100644
--- a/src/repo/git/checkout.rs
+++ b/src/repo/git/checkout.rs
@@ -21,7 +21,7 @@ impl Repo {
     ) -> Result<(), RepoError> {
         let repo = self.repo()?;
 
-        let workdir = repo.work_dir().ok_or(RepoError::NoWorktree)?;
+        let workdir = repo.workdir().ok_or(RepoError::NoWorktree)?;
         let head_tree = head
             .object()
             .context("could not find object HEAD points to")?
diff --git a/src/repo/git/ffmerge.rs b/src/repo/git/ffmerge.rs
index 382718b..7f30a4b 100644
--- a/src/repo/git/ffmerge.rs
+++ b/src/repo/git/ffmerge.rs
@@ -1,17 +1,9 @@
 use super::{Repo, RepoError};
 
-use anyhow::Context;
-use gix::{
-    clone::checkout::main_worktree::ProgressId, interrupt::IS_INTERRUPTED, progress, remote, Id,
-    Progress,
-};
-
-use gix_index::{File, State};
-use tracing::debug;
+use gix::Id;
 
 impl Repo {
-    pub fn ffmerge(&self, a: Id, b: Id) -> Result<(), RepoError> {
-
+    pub fn ffmerge(&self, _a: Id, _b: Id) -> Result<(), RepoError> {
         Ok(())
     }
 }
diff --git a/src/update/mod.rs b/src/update/mod.rs
index e43f108..1ce718b 100644
--- a/src/update/mod.rs
+++ b/src/update/mod.rs
@@ -1,6 +1,5 @@
 use std::fmt::{Debug, Display};
 
-use gix::bstr::ByteSlice;
 use tracing::debug;
 
 use crate::{
@@ -61,30 +60,6 @@ impl Repo {
         }
 
         Ok(UpdateResult::no_changes(self.name.clone()))
-
-        // let merged = repo.branches(Some(BranchType::Local))?
-        //         .filter_map(|x| x.ok())
-        //         .try_fold(false, |mut merged, (mut branch, _)| {
-        //             let name = format!("refs/heads/{}", Repo::branch_name(&branch));
-
-        //             if branch.upstream().is_ok() {
-        //                 let upstream = branch.upstream().unwrap();
-
-        //                 debug!("branch: {}", name);
-
-        //                 merged |= self.merge(repo, &mut branch, &upstream)?;
-        //                 Ok::<bool, RepoError>(merged)
-        //             } else {
-        //                 debug!("not updating branch: {}: branch does not have upstream tracking branch set", name);
-        //                 Ok(merged)
-        //             }
-        //         })?;
-
-        // if merged {
-        //     Ok(UpdateResult::merged(self.name.clone()))
-        // } else {
-        //     Ok(UpdateResult::no_changes(self.name.clone()))
-        // }
     }
 }