flyby fixes

Just some fixes while perusing the codebase.

Author: Byron

Cargo.lock

@@ -9,5 +9,3 @@ publish = false
 gix.workspace = true
 anyhow.workspace = true
 bstr.workspace = true
-serde_json = "1.0.142"
-serde.workspace = true

crates/but-status/Cargo.toml

@@ -4,8 +4,8 @@ use gix::status::index_worktree;
 /// This includes files in the index that are considered conflicted.
 ///
 /// TODO: This is a copy of `create_wd_tree` from the old world. Ideally we
-/// should share between the old and new worlds to prevent duplication beween
-/// these.
+///       should share between the old and new worlds to prevent duplication between
+///       these.
 pub fn create_wd_tree(
     repo: &gix::Repository,
     untracked_limit_in_bytes: u64,

crates/but-status/src/lib.rs

@@ -1,17 +1,13 @@
-use bstr::{BStr, BString, ByteSlice};
-use std::{collections::HashSet, path::Path};
+use bstr::{BStr, ByteSlice};
+use std::path::Path;
 
-/// Turn `rhs` into `lhs` by modifying `rhs`. This will leave `rhs` intact as much as possible, but will remove
+/// Turn `rhs` into `lhs` by modifying `rhs`. This will leave `rhs` intact as much as possible.
 /// Note that conflicting entries will be replaced by an addition or edit automatically.
 /// extensions that might be affected by these changes, for a lack of finesse with our edits.
-///
-/// `filter_paths` is an optional filter that allows to specify which paths should be considered for the update.
-/// If `None`, all paths are considered.
 pub fn apply_lhs_to_rhs(
     workdir: &Path,
     lhs: &gix::index::State,
     rhs: &mut gix::index::State,
-    filter_paths: Option<HashSet<BString>>,
 ) -> anyhow::Result<()> {
     let mut num_sorted_entries = rhs.entries().len();
     let mut needs_sorting = false;
@@ -31,12 +27,6 @@ pub fn apply_lhs_to_rhs(
 
     use gix::diff::index::Change;
     for change in changes {
-        if let Some(filter_paths) = &filter_paths {
-            if !filter_paths.contains(&change.location().to_owned()) {
-                continue;
-            }
-        }
-
         match change {
             Change::Addition { location, .. } => {
                 delete_entry_by_path_bounded(rhs, location.as_bstr(), &mut num_sorted_entries);

crates/but-workspace/src/commit_engine/index.rs

@@ -577,7 +577,6 @@ pub fn create_commit_and_update_refs(
             repo.workdir().expect("non-bare"),
             &tree_index,
             &mut disk_index,
-            None,
         )?;
         out.index = disk_index.into();
     } else {

crates/but-workspace/src/commit_engine/mod.rs

@@ -24,7 +24,6 @@ gitbutler-branch.workspace = true
 gitbutler-serde.workspace = true
 gitbutler-fs.workspace = true
 gitbutler-reference.workspace = true
-gitbutler-diff.workspace = true
 gitbutler-stack.workspace = true
 but-core.workspace = true