Use gix-path exe_invocation

software-mansion · Jun 28, 2024 · 0b8f14e · 0b8f14e
1 parent 9b2ab27
commit 0b8f14e
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 3 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -74,6 +74,7 @@ fs4 = { version = "0.7", features = ["tokio"] }
 fs_extra = "1"
 futures = { version = "0.3", default-features = false, features = ["std", "async-await"] }
 gix = ">=0.55"
+gix-path = "0.10"
 glob = "0.3"
 ignore = "0.4"
 include_dir = "0.7"

diff --git a/scarb/Cargo.toml b/scarb/Cargo.toml
@@ -44,6 +44,7 @@ dunce.workspace = true
 fs4.workspace = true
 futures.workspace = true
 gix.workspace = true
+gix-path.workspace = true
 glob.workspace = true
 ignore.workspace = true
 include_dir.workspace = true

diff --git a/scarb/src/sources/git/client.rs b/scarb/src/sources/git/client.rs
@@ -399,7 +399,7 @@ impl PackageRepository {
 }
 
 fn git_command() -> Command {
-    let mut cmd = Command::new("git");
+    let mut cmd = Command::new(gix_path::env::exe_invocation());
 
     // If Scarb is run by Git (for example, the `exec` command in `git rebase`),
     // the GIT_DIR is set by Git and will point to the wrong location (this takes precedence