From 11d81b95d45f73d277e17b9df53e9ad359937175 Mon Sep 17 00:00:00 2001 From: Jakub Konka Date: Tue, 9 Sep 2025 08:36:25 +0200 Subject: [PATCH] Revert "git: Use self.git_binary_path instead raw git string" (#37828) Reverts zed-industries/zed#37757 --- crates/git/src/repository.rs | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/crates/git/src/repository.rs b/crates/git/src/repository.rs index d171743e99af4e5f989156397f30a31d40a52831..fd12dafa98575b5d8b0190d6ed4e894ac61e8165 100644 --- a/crates/git/src/repository.rs +++ b/crates/git/src/repository.rs @@ -1205,10 +1205,9 @@ impl GitRepository for RealGitRepository { env: Arc>, ) -> BoxFuture<'_, Result<()>> { let working_directory = self.working_directory(); - let git_binary_path = self.git_binary_path.clone(); self.executor .spawn(async move { - let mut cmd = new_smol_command(&git_binary_path); + let mut cmd = new_smol_command("git"); cmd.current_dir(&working_directory?) .envs(env.iter()) .args(["stash", "push", "--quiet"]) @@ -1230,10 +1229,9 @@ impl GitRepository for RealGitRepository { fn stash_pop(&self, env: Arc>) -> BoxFuture<'_, Result<()>> { let working_directory = self.working_directory(); - let git_binary_path = self.git_binary_path.clone(); self.executor .spawn(async move { - let mut cmd = new_smol_command(&git_binary_path); + let mut cmd = new_smol_command("git"); cmd.current_dir(&working_directory?) .envs(env.iter()) .args(["stash", "pop"]); @@ -1258,10 +1256,9 @@ impl GitRepository for RealGitRepository { env: Arc>, ) -> BoxFuture<'_, Result<()>> { let working_directory = self.working_directory(); - let git_binary_path = self.git_binary_path.clone(); self.executor .spawn(async move { - let mut cmd = new_smol_command(&git_binary_path); + let mut cmd = new_smol_command("git"); cmd.current_dir(&working_directory?) .envs(env.iter()) .args(["commit", "--quiet", "-m"]) @@ -1305,7 +1302,7 @@ impl GitRepository for RealGitRepository { let executor = cx.background_executor().clone(); async move { let working_directory = working_directory?; - let mut command = new_smol_command(&self.git_binary_path); + let mut command = new_smol_command("git"); command .envs(env.iter()) .current_dir(&working_directory) @@ -1336,7 +1333,7 @@ impl GitRepository for RealGitRepository { let working_directory = self.working_directory(); let executor = cx.background_executor().clone(); async move { - let mut command = new_smol_command(&self.git_binary_path); + let mut command = new_smol_command("git"); command .envs(env.iter()) .current_dir(&working_directory?) @@ -1362,7 +1359,7 @@ impl GitRepository for RealGitRepository { let remote_name = format!("{}", fetch_options); let executor = cx.background_executor().clone(); async move { - let mut command = new_smol_command(&self.git_binary_path); + let mut command = new_smol_command("git"); command .envs(env.iter()) .current_dir(&working_directory?)