Empty proxies can disable the proxy; cleanup test fixture, let it hav…

…e its own

git-repository/tests/fixtures/make_config_repos.sh

@@ -0,0 +1,22 @@
+set -eu -o pipefail
+
+git init http-config
+(cd http-config
+  git config http.extraHeader "ExtraHeader: value1"
+  git config --add http.extraHeader ""
+  git config --add http.extraHeader "ExtraHeader: value2"
+  git config --add http.extraHeader "ExtraHeader: value3"
+  git config http.followRedirects initial
+  git config http.lowSpeedLimit 5k
+  git config http.lowSpeedTime 10
+  git config http.postBuffer 8k
+  git config http.proxy localhost:9090
+  git config http.proxyAuthMethod anyauth
+  git config http.userAgent agentJustForHttp
+)
+
+git init http-config-empty-proxy
+(cd http-config-empty-proxy
+  git config http.proxy localhost:9090
+  git config --add http.proxy "" # a value override disabling it later
+)

git-repository/tests/fixtures/make_fetch_repos.sh

@@ -1,5 +1,6 @@
 set -eu -o pipefail
 
+# IMPORTANT: keep this repo small as it's used for writes, hence will be executed for each writer!
 git clone --bare "${1:?First argument is the complex base repo from make_remote_repos.sh/base}" base
 
 git clone --shared base clone-as-base-with-changes
@@ -28,18 +29,3 @@ git clone --shared base worktree-root
   git worktree add --lock ../wt-c-locked
   git worktree add ../wt-deleted && rm -Rf ../wt-deleted
 )
-
-git init http-config
-(cd http-config
-  git config http.extraHeader "ExtraHeader: value1"
-  git config --add http.extraHeader ""
-  git config --add http.extraHeader "ExtraHeader: value2"
-  git config --add http.extraHeader "ExtraHeader: value3"
-  git config http.followRedirects initial
-  git config http.lowSpeedLimit 5k
-  git config http.lowSpeedTime 10
-  git config http.postBuffer 8k
-  git config http.proxy localhost:9090
-  git config http.proxyAuthMethod anyauth
-  git config http.userAgent agentJustForHttp
-)

git-repository/tests/repository/config/transport_options.rs

@@ -2,20 +2,8 @@
 mod http {
     use git_repository as git;
 
-    fn base_repo_path() -> String {
-        git::path::realpath(
-            git_testtools::scripted_fixture_repo_read_only("make_remote_repos.sh")
-                .unwrap()
-                .join("base"),
-        )
-        .unwrap()
-        .to_string_lossy()
-        .into_owned()
-    }
-
     pub(crate) fn repo(name: &str) -> git::Repository {
-        let dir = git_testtools::scripted_fixture_repo_read_only_with_args("make_fetch_repos.sh", [base_repo_path()])
-            .unwrap();
+        let dir = git_testtools::scripted_fixture_repo_read_only("make_config_repos.sh").unwrap();
         git::open_opts(dir.join(name), git::open::Options::isolated()).unwrap()
     }
 
@@ -72,4 +60,22 @@ mod http {
             "backed is never set as it's backend specific, rather custom options typically"
         )
     }
+
+    #[test]
+    fn empty_proxy_string_turns_it_off() {
+        let repo = repo("http-config-empty-proxy");
+
+        let http_config = repo
+            .transport_options("https://example.com/does/not/matter")
+            .expect("valid configuration")
+            .expect("configuration available for http");
+        let http_config = http_config
+            .downcast_ref::<git_transport::client::http::Options>()
+            .expect("http options have been created");
+        assert_eq!(
+            http_config.proxy.as_deref(),
+            Some(""),
+            "empty strings indicate that the proxy is to be unset by the transport"
+        );
+    }
 }