Merge branch 'GitoxideLabs:main' into raw-email-attempt-fix

Author: Pingasmaster

gitoxide-core/src/pack/receive.rs

@@ -64,8 +64,9 @@ where
     .is_some();
 
     let agent = gix::protocol::agent(gix::env::agent());
-    let mut handshake: gix::protocol::Handshake = gix::protocol::fetch::handshake(
+    let mut handshake = gix::protocol::handshake(
         &mut transport.inner,
+        transport::Service::UploadPack,
         gix::protocol::credentials::builtin,
         vec![("agent".into(), Some(agent.clone()))],
         &mut progress,

gix-protocol/src/fetch/handshake.rs

@@ -34,13 +34,6 @@ pub mod response;
 #[cfg(feature = "fetch")]
 pub(crate) mod function;
 
-#[cfg(any(feature = "blocking-client", feature = "async-client"))]
-#[cfg(feature = "handshake")]
-mod handshake;
-#[cfg(any(feature = "blocking-client", feature = "async-client"))]
-#[cfg(feature = "handshake")]
-pub use handshake::upload_pack as handshake;
-
 #[cfg(feature = "fetch")]
 pub mod negotiate;
 

gix-protocol/src/fetch/mod.rs

@@ -14,6 +14,7 @@ use crate::{credentials, handshake::refs};
 /// turns out to be required. `extra_parameters` are the parameters `(name, optional value)` to add to the handshake,
 /// each time it is performed in case authentication is required.
 /// `progress` is used to inform about what's currently happening.
+/// The `service` tells the server whether to be in 'send' or 'receive' mode.
 #[allow(clippy::result_large_err)]
 #[maybe_async]
 pub async fn handshake<AuthFn, T>(

gix-protocol/src/handshake/function.rs

@@ -123,7 +123,7 @@ mod error {
 
     use crate::{credentials, handshake::refs};
 
-    /// The error returned by [`handshake()`][crate::fetch::handshake()].
+    /// The error returned by [`handshake()`][crate::handshake()].
     #[derive(Debug, thiserror::Error)]
     #[allow(missing_docs)]
     pub enum Error {

gix-protocol/src/handshake/mod.rs

@@ -79,8 +79,9 @@ mod fetch_fn {
             refs,
             v1_shallow_updates: _ignored_shallow_updates_as_it_is_deprecated,
             capabilities,
-        } = gix_protocol::fetch::handshake(
+        } = gix_protocol::handshake(
             &mut transport,
+            gix_transport::Service::UploadPack,
             authenticate,
             delegate.handshake_extra_parameters(),
             &mut progress,

gix-protocol/tests/protocol/fetch/_impl.rs

@@ -143,8 +143,9 @@ where
         if let Some(config) = self.transport_options.as_ref() {
             self.transport.inner.configure(&**config)?;
         }
-        let mut handshake: gix_protocol::Handshake = gix_protocol::fetch::handshake(
+        let mut handshake = gix_protocol::handshake(
             &mut self.transport.inner,
+            gix_transport::Service::UploadPack,
             authenticate,
             handshake_parameters,
             &mut progress,