[transport] flexible version of version support check doesn't actually work :D

As we also hold a mutable borrow to the refs. Fair enough.

Sebastian Thiel committed 5 years ago

Commit 2b220f01 parent 22f7e6710 files · +89 −28Browse files

Showing the changes to git-protocol/src/fetch/function.rs (1 of 10 files). Show all

Unified · Split

 use git_features::{progress, progress::Progress};
 use git_transport::{
     client,
-    client::{SetServiceResponse, TransportV2Ext},
+    client::{ProtocolDecision, SetServiceResponse, TransportV2Ext},
     Service,
 };
 use maybe_async::maybe_async;
             Err(err) => Err(err),
         }?;
+        match transport.supports_advertised_version(actual_protocol) {
+            ProtocolDecision::Continue => {}
+            ProtocolDecision::CloseConnectionImmediately => {
+                drop(refs);
+                transport.close().await;
+                return Err((Error::TransportProtocolPolicyViolation {
+                    actual_version: actual_protocol,
+                }));
+            }
+        }
         let parsed_refs = match refs {
             Some(mut refs) => {
                 assert_eq!(
         (actual_protocol, parsed_refs, capabilities)
     }; // this scope is needed, see https://github.com/rust-lang/rust/issues/76149
-    if transport.desired_protocol_version() != protocol_version {
-        progress.info(format!(
-            "server did not support protocol {} and downgraded to {}",
-            transport.desired_protocol_version() as usize,
-            protocol_version as usize,
-        ));
-    }
     let parsed_refs = match parsed_refs {
         Some(refs) => refs,
         None => {