From adee50016007619495c93580e845ae757377c4f0 Mon Sep 17 00:00:00 2001
From: Sebastian Thiel <sebastian.thiel@icloud.com>
Date: Thu, 21 Mar 2024 12:48:26 +0100
Subject: [PATCH] Turn`curl` into a workspace package

That way, versions can't diverge.
---
 Cargo.toml               | 1 +
 gix-transport/Cargo.toml | 2 +-
 gix/Cargo.toml           | 6 +++---
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index dac6903073..80e7fae9fc 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -305,6 +305,7 @@ prodash = { version = "28.0.0", default-features = false }
 futures-lite = { version = "2.1.0", default-features = false, features = ["std"] }
 faster-hex = { version = "0.9.0", default-features = false }
 reqwest = { version = "0.12.0", default-features = false, features = ["charset", "http2", "macos-system-configuration"] } # all but the 'default-tls' feature
+curl = { version = "0.4" }
 
 [package.metadata.docs.rs]
 features = ["document-features", "max"]
diff --git a/gix-transport/Cargo.toml b/gix-transport/Cargo.toml
index ff69ba6498..6b9a507336 100644
--- a/gix-transport/Cargo.toml
+++ b/gix-transport/Cargo.toml
@@ -75,7 +75,7 @@ pin-project-lite = { version = "0.2.6", optional = true }
 base64 = { version = "0.21.0", optional = true }
 
 # for http-client-curl. Additional configuration should be performed on higher levels of the dependency tree.
-curl = { version = "0.4", optional = true }
+curl = { workspace = true, optional = true }
 
 # for http-client-reqwest
 reqwest = { workspace = true, optional = true, features = ["blocking"] }
diff --git a/gix/Cargo.toml b/gix/Cargo.toml
index 69af437d49..b8ad5b6967 100644
--- a/gix/Cargo.toml
+++ b/gix/Cargo.toml
@@ -127,7 +127,7 @@ blocking-network-client = ["gix-protocol/blocking-client", "gix-pack/streaming-i
 ## Stacks with `blocking-network-client` to provide support for HTTP/S using **curl**, and implies blocking networking as a whole, making the `https://` transport available.
 blocking-http-transport-curl = ["blocking-network-client", "gix-transport/http-client-curl"]
 ## Stacks with `blocking-http-transport-curl` and also enables the `rustls` backend to avoid `openssl`.
-blocking-http-transport-curl-rustls = ["blocking-http-transport-curl", "dep:curl-for-configuration-only", "curl-for-configuration-only?/rustls"]
+blocking-http-transport-curl-rustls = ["blocking-http-transport-curl", "dep:curl", "curl?/rustls"]
 ## Stacks with `blocking-network-client` to provide support for HTTP/S using **reqwest**, and implies blocking networking as a whole, making the `https://` transport available.
 blocking-http-transport-reqwest = ["blocking-network-client", "gix-transport/http-client-reqwest"]
 ## Stacks with `blocking-http-transport-reqwest` and enables `https://` via the `rustls` crate.
@@ -305,8 +305,8 @@ serde = { version = "1.0.114", optional = true, default-features = false, featur
 smallvec = "1.9.0"
 async-std = { version = "1.12.0", optional = true }
 
-# Must match the one in `gix-transport`.
-curl-for-configuration-only = { package = "curl", version = "0.4", optional = true }
+# Used for feature-configuration only.
+curl = { workspace = true, optional = true }
 
 ## For use in rev-parse, which provides searching commits by running a regex on their message.
 ##