refactor

Author: Byron

gitoxide-core/src/repository/fetch.rs

@@ -320,7 +320,7 @@ pub(crate) mod function {
                 err,
                 "server sent {} tips, {} were filtered due to {} refspec(s).",
                 map.remote_refs.len(),
-                map.remote_refs.len() - map.mappings.len(),
+                map.remote_refs.len().saturating_sub(map.mappings.len()),
                 refspecs.len()
             )?;
         }

gix/src/clone/fetch/mod.rs

@@ -2,6 +2,7 @@ use crate::{
     bstr::{BString, ByteSlice},
     clone::PrepareFetch,
 };
+use gix_ref::Category;
 
 /// The error returned by [`PrepareFetch::fetch_only()`].
 #[derive(Debug, thiserror::Error)]
@@ -49,6 +50,8 @@ pub enum Error {
     CommitterOrFallback(#[from] crate::config::time::Error),
     #[error(transparent)]
     RefMap(#[from] crate::remote::ref_map::Error),
+    #[error(transparent)]
+    ReferenceName(#[from] gix_validate::reference::name::Error),
 }
 
 /// Modification
@@ -106,15 +109,13 @@ impl PrepareFetch {
 
         // For shallow clones without custom configuration, we'll use a single-branch refspec
         // to match git's behavior (matching git's single-branch behavior for shallow clones).
-        let use_single_branch_for_shallow = self.shallow != remote::fetch::Shallow::NoChange
-            && self.configure_remote.is_none()
-            && remote.fetch_specs.is_empty();
+        let use_single_branch_for_shallow =
+            self.shallow != remote::fetch::Shallow::NoChange && remote.fetch_specs.is_empty();
 
         let target_ref = if use_single_branch_for_shallow {
             // Determine target branch from user-specified ref_name or default branch
             if let Some(ref_name) = &self.ref_name {
-                // User specified a branch, use that
-                Some(format!("refs/heads/{}", ref_name.as_ref().as_bstr()))
+                Some(Category::LocalBranch.to_full_name(ref_name.as_ref().as_bstr())?)
             } else {
                 // For shallow clones without a specified ref, we need to determine the default branch.
                 // We'll connect to get HEAD information. For Protocol V2, we need to explicitly list refs.
@@ -129,7 +130,7 @@ impl PrepareFetch {
                         refs.iter().find_map(|r| match r {
                             gix_protocol::handshake::Ref::Symbolic {
                                 full_ref_name, target, ..
-                            } if full_ref_name == "HEAD" => Some(target.to_string()),
+                            } if full_ref_name == "HEAD" => gix_ref::FullName::try_from(target).ok(),
                             _ => None,
                         })
                     })
@@ -143,9 +144,9 @@ impl PrepareFetch {
                         repo.config
                             .resolved
                             .string(crate::config::tree::Init::DEFAULT_BRANCH)
-                            .and_then(|name| name.to_str().ok().map(|s| format!("refs/heads/{}", s)))
+                            .and_then(|name| Category::LocalBranch.to_full_name(name.as_bstr()).ok())
                     })
-                    .unwrap_or_else(|| "refs/heads/main".to_string());
+                    .unwrap_or_else(|| gix_ref::FullName::try_from("refs/heads/main").expect("known to be valid"));
 
                 // Drop the connection explicitly to release the borrow on remote
                 drop(connection);
@@ -156,11 +157,12 @@ impl PrepareFetch {
             None
         };
 
-        // Set up refspec based on whether we're doing a single-branch shallow clone
+        // Set up refspec based on whether we're doing a single-branch shallow clone,
+        // which requires a single ref to match Git unless it's overridden.
         if remote.fetch_specs.is_empty() {
             if let Some(target_ref) = &target_ref {
                 // Single-branch refspec for shallow clones
-                let short_name = target_ref.strip_prefix("refs/heads/").unwrap_or(target_ref.as_str());
+                let short_name = target_ref.shorten();
                 remote = remote
                     .with_refspecs(
                         Some(format!("+{target_ref}:refs/remotes/{remote_name}/{short_name}").as_str()),

gix/src/config/tree/sections/init.rs

@@ -5,6 +5,7 @@ use crate::{
 
 impl Init {
     /// The `init.defaultBranch` key.
+    // TODO: review its usage for cases where this key is not set - sometimes it's 'master', sometimes it's 'main'.
     pub const DEFAULT_BRANCH: keys::Any = keys::Any::new("defaultBranch", &config::Tree::INIT)
         .with_deviation("If not set, we use `main` instead of `master`");
 }

gix/tests/gix/clone.rs

@@ -4,6 +4,10 @@ use crate::{remote, util::restricted};
 mod blocking_io {
     use std::{borrow::Cow, path::Path, sync::atomic::AtomicBool};
 
+    use crate::{
+        remote,
+        util::{hex_to_id, restricted},
+    };
     use gix::{
         bstr::BString,
         config::tree::{Clone, Core, Init, Key},
@@ -14,11 +18,7 @@ mod blocking_io {
     };
     use gix_object::bstr::ByteSlice;
     use gix_ref::TargetRef;
-
-    use crate::{
-        remote,
-        util::{hex_to_id, restricted},
-    };
+    use gix_refspec::parse::Operation;
 
     #[test]
     fn fetch_shallow_no_checkout_then_unshallow() -> crate::Result {
@@ -104,15 +104,14 @@ mod blocking_io {
 
         // The refspec should be for a single branch (main), not a wildcard
         let refspec_str = refspecs[0].to_str().expect("valid utf8");
-        assert!(
-            !refspec_str.contains("*"),
-            "shallow clone refspec should not use wildcard: {}",
-            refspec_str
-        );
-        assert!(
-            refspec_str.contains("refs/heads/main"),
-            "shallow clone refspec should reference the main branch: {}",
-            refspec_str
+        assert_eq!(
+            refspec_str,
+            if cfg!(windows) {
+                "+refs/heads/master:refs/remotes/origin/master"
+            } else {
+                "+refs/heads/main:refs/remotes/origin/main"
+            },
+            "shallow clone refspec should not use wildcard and should be the main branch: {refspec_str}"
         );
 
         Ok(())
@@ -238,7 +237,16 @@ mod blocking_io {
     fn from_non_shallow_by_deepen_exclude_then_deepen_to_unshallow() -> crate::Result {
         let tmp = gix_testtools::tempfile::TempDir::new()?;
         let excluded_leaf_refs = ["g", "h", "j"];
+
         let (repo, _change) = gix::prepare_clone_bare(remote::repo("base").path(), tmp.path())?
+            .with_fetch_options(gix::remote::ref_map::Options {
+                extra_refspecs: vec![gix::refspec::parse(
+                    "refs/heads/*:refs/remotes/origin/*".into(),
+                    Operation::Fetch,
+                )?
+                .into()],
+                ..Default::default()
+            })
             .with_shallow(Shallow::Exclude {
                 remote_refs: excluded_leaf_refs
                     .into_iter()