adapt to changes in `git-protocol`

Sebastian Thiel committed 4 years ago

Commit 121c93f1 parent 68dc86f2 files · +9 −2Browse files

Unified · Split

2 files

@@ -1,5 +1,9 @@
1	use std::str::FromStr;	1	use std::str::FromStr;
2		2
		3	pub fn agent() -> &'static str {
		4	concat!("oxide-", env!("CARGO_PKG_VERSION"))
		5	}
		6
3	#[derive(Eq, PartialEq, Debug)]	7	#[derive(Eq, PartialEq, Debug)]
4	pub enum Protocol {	8	pub enum Protocol {
5	V1,	9	V1,

+use std::borrow::Cow;
 use std::{
     io,
     path::PathBuf,
         &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()));
         &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) {
             protocol::credentials::builtin,
             progress,
             protocol::FetchConnection::TerminateOnSuccessfulCompletion,
+            crate::net::agent(),
         )?;
         Ok(())
     }
                 protocol::credentials::builtin,
                 progress,
                 protocol::FetchConnection::TerminateOnSuccessfulCompletion,
+                crate::net::agent(),
             ))
         })
         .await?;