Use gix::refs::PartialName as even stronger guarantee for what's in there

Author: Byron

Cargo.lock

@@ -35,7 +35,7 @@ resolver = "2"
 [workspace.dependencies]
 bstr = { version = "1.10.0", features = ["serde"] }
 # Add the `tracing` or `tracing-detail` features to see more of gitoxide in the logs. Useful to see which programs it invokes.
-gix = { git = "https://github.com/Byron/gitoxide", rev = "7dff44754e0fdc369f92221468fb953bad9be60a", default-features = false, features = [] }
+gix = { git = "https://github.com/Byron/gitoxide", rev = "7dff44754e0fdc369f92221468fb953bad9be60a", default-features = false, features = ["serde"] }
 git2 = { version = "0.18.3", features = [
     "vendored-openssl",
     "vendored-libgit2",

Cargo.toml

@@ -35,9 +35,12 @@ pub fn list_branches(
     for reference in platform.all()?.filter_map(Result::ok) {
         // Loosely match on branch names
         if let Some(branch_names) = &filter_branch_names {
-            let has_matching_name = branch_names
-                .iter()
-                .any(|branch_name| reference.name().as_bstr().ends_with_str(&branch_name.0));
+            let has_matching_name = branch_names.iter().any(|branch_name| {
+                reference
+                    .name()
+                    .as_bstr()
+                    .ends_with_str(branch_name.as_bstr())
+            });
 
             if !has_matching_name {
                 continue;
@@ -324,7 +327,7 @@ fn should_list_git_branch(identity: &BranchIdentity) -> bool {
         b"gitbutler/oplog",
         b"HEAD",
     ];
-    !TECHNICAL_IDENTITIES.contains(&identity.0.as_bytes())
+    !TECHNICAL_IDENTITIES.contains(&identity.as_bytes())
 }
 
 /// A filter that can be applied to the branch listing
@@ -413,9 +416,13 @@ pub struct VirtualBranchReference {
 /// a list of enriched branch data in the form of `BranchData`.
 pub fn get_branch_listing_details(
     ctx: &CommandContext,
-    branch_names: impl IntoIterator<Item = impl Into<BranchIdentity>>,
+    branch_names: impl IntoIterator<Item = impl TryInto<BranchIdentity>>,
 ) -> Result<Vec<BranchListingDetails>> {
-    let branch_names: Vec<_> = branch_names.into_iter().map(Into::into).collect();
+    let branch_names: Vec<_> = branch_names
+        .into_iter()
+        .map(TryInto::try_into)
+        .filter_map(Result::ok)
+        .collect();
     let repo = ctx.repository();
     let branches = list_branches(ctx, None, Some(branch_names.clone()))?;
     let default_target = ctx

crates/gitbutler-branch-actions/src/branch.rs

@@ -154,7 +154,7 @@ mod util {
     impl Default for ExpectedBranchListing<'static> {
         fn default() -> Self {
             ExpectedBranchListing {
-                identity: "<invalid identity - should always be specified".into(),
+                identity: "invalid-identity-should-always-be-specified".into(),
                 remotes: vec![],
                 virtual_branch_given_name: None,
                 virtual_branch_in_workspace: false,

crates/gitbutler-branch-actions/tests/virtual_branches/list.rs

@@ -8,7 +8,7 @@ publish = false
 [dependencies]
 anyhow = "1.0.86"
 git2.workspace = true
-gix.workspace = true
+gix = { workspace = true, features = ["serde"] }
 gitbutler-reference.workspace = true
 gitbutler-serde.workspace = true
 gitbutler-id.workspace = true