refactor: replace pixi_git implementation with the unified rattler_git crate

Cargo.toml

@@ -230,13 +230,14 @@ zstd = { version = "0.13.3", default-features = false }
 
 # Rattler crates
 file_url = "0.3.0"
-rattler = { version = "0.46", default-features = false }
+rattler = { version = "0.47", default-features = false }
 rattler_cache = { version = "0.10", default-features = false }
-rattler_conda_types = { version = "0.47", default-features = false, features = [
+rattler_conda_types = { version = "0.48", default-features = false, features = [
   "rayon",
 ] }
-rattler_config = { version = "0.5", default-features = false }
+rattler_config = { version = "0.6", default-features = false }
 rattler_digest = { version = "1.3", default-features = false }
+rattler_git = { version = "0.2", default-features = false }
 rattler_index = { version = "0.30", default-features = false, features = [
   "s3",
 ] }
@@ -247,11 +248,11 @@ rattler_networking = { version = "0.30", default-features = false, features = [
   "google-cloud-auth",
 ] }
 rattler_package_streaming = { version = "0.26", default-features = false }
-rattler_repodata_gateway = { version = "0.29", default-features = false }
+rattler_repodata_gateway = { version = "0.30", default-features = false }
 rattler_s3 = { version = "0.2", default-features = false }
 rattler_shell = { version = "0.27", default-features = false }
 rattler_solve = { version = "7.2", default-features = false }
-rattler_upload = { version = "0.8", default-features = false, features = [
+rattler_upload = { version = "0.9", default-features = false, features = [
   "s3",
   "sigstore-sign",
 ] }
@@ -268,6 +269,19 @@ rattler_build_types = { version = "0.1.8" }
 rattler_build_variant_config = { version = "0.1.9" }
 
 [patch.crates-io]
+# TEMPORARY: track rattler-build main for the unified git cache (rattler_git
+# 0.2, conda/rattler#2590). rattler-build #2648 is merged to main but not yet
+# released; its published crates still depend on the pre-0.47 rattler stack, so
+# the whole interdependent rattler_build_* set must come from main to stay
+# consistent with rattler_git 0.2. Remove once rattler-build is released.
+rattler_build_core = { git = "https://github.com/prefix-dev/rattler-build", branch = "main" }
+rattler_build_jinja = { git = "https://github.com/prefix-dev/rattler-build", branch = "main" }
+rattler_build_networking = { git = "https://github.com/prefix-dev/rattler-build", branch = "main" }
+rattler_build_recipe = { git = "https://github.com/prefix-dev/rattler-build", branch = "main" }
+rattler_build_script = { git = "https://github.com/prefix-dev/rattler-build", branch = "main" }
+rattler_build_source_cache = { git = "https://github.com/prefix-dev/rattler-build", branch = "main" }
+rattler_build_types = { git = "https://github.com/prefix-dev/rattler-build", branch = "main" }
+rattler_build_variant_config = { git = "https://github.com/prefix-dev/rattler-build", branch = "main" }
 version-ranges = { git = "https://github.com/astral-sh/pubgrub", rev = "d8efd77673c9a90792da9da31b6c0da7ea8a324b" }
 
 # Redirect crates.io's `reqwest-middleware` to a local shim that re-exports

crates/pixi_compute_sources/src/git.rs

@@ -141,7 +141,13 @@ impl Key for CheckoutGit {
         // the branch HEAD when not (fresh resolve).
         Arc::new(
             resolver
-                .fetch(self.0.clone(), client, cache_dir.into_std_path_buf(), None)
+                .fetch(
+                    self.0.clone(),
+                    pixi_git::to_git_client(client),
+                    cache_dir.into_std_path_buf(),
+                    None,
+                    pixi_git::default_checkout_options(),
+                )
                 .await,
         )
     }

crates/pixi_git/Cargo.toml

@@ -10,24 +10,5 @@ repository.workspace = true
 version = "0.0.1"
 
 [dependencies]
-dashmap = { workspace = true }
-dunce = { workspace = true }
-fs-err = { workspace = true, features = ["tokio"] }
-pixi_utils = { workspace = true }
+rattler_git = { workspace = true }
 rattler_networking = { workspace = true }
-reqwest = { workspace = true, features = ["blocking"] }
-reqwest-middleware = { workspace = true }
-serde = { workspace = true }
-thiserror = { workspace = true }
-tokio = { workspace = true }
-tracing = { workspace = true }
-url = { workspace = true }
-urlencoding = { version = "2.1.3" }
-which = { workspace = true }
-
-
-[dev-dependencies]
-fs-err = { workspace = true }
-pixi_test_utils = { workspace = true }
-reqwest-middleware = { workspace = true }
-tempfile = { workspace = true }