adapt to changes in git-protocol

Byron · Nov 9, 2022 · 121c93f · 121c93f
1 parent 68dc86f
commit 121c93f
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/gitoxide-core/src/net.rs b/gitoxide-core/src/net.rs
@@ -1,5 +1,9 @@
 use std::str::FromStr;
 
+pub fn agent() -> &'static str {
+    concat!("oxide-", env!("CARGO_PKG_VERSION"))
+}
+
 #[derive(Eq, PartialEq, Debug)]
 pub enum Protocol {
     V1,

diff --git a/gitoxide-core/src/pack/receive.rs b/gitoxide-core/src/pack/receive.rs
@@ -1,3 +1,4 @@
+use std::borrow::Cow;
 use std::{
     io,
     path::PathBuf,
@@ -51,7 +52,7 @@ impl<W> protocol::fetch::DelegateBlocking for CloneDelegate<W> {
         &mut self,
         server: &Capabilities,
         arguments: &mut Vec<BString>,
-        _features: &mut Vec<(&str, Option<&str>)>,
+        _features: &mut Vec<(&str, Option<Cow<'_, str>>)>,
     ) -> io::Result<LsRefsAction> {
         if server.contains("ls-refs") {
             arguments.extend(FILTER.iter().map(|r| format!("ref-prefix {}", r).into()));
@@ -67,7 +68,7 @@ impl<W> protocol::fetch::DelegateBlocking for CloneDelegate<W> {
         &mut self,
         version: transport::Protocol,
         server: &Capabilities,
-        _features: &mut Vec<(&str, Option<&str>)>,
+        _features: &mut Vec<(&str, Option<Cow<'_, str>>)>,
         _refs: &[Ref],
     ) -> io::Result<Action> {
         if !self.wanted_refs.is_empty() && !remote_supports_ref_in_want(server) {
@@ -172,6 +173,7 @@ mod blocking_io {
             protocol::credentials::builtin,
             progress,
             protocol::FetchConnection::TerminateOnSuccessfulCompletion,
+            crate::net::agent(),
         )?;
         Ok(())
     }
@@ -245,6 +247,7 @@ mod async_io {
                 protocol::credentials::builtin,
                 progress,
                 protocol::FetchConnection::TerminateOnSuccessfulCompletion,
+                crate::net::agent(),
             ))
         })
         .await?;