oak-team/oak-gpui
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "git: Use self.git_binary_path instead raw git string" (#37828)

Browse Source 
Reverts zed-industries/zed#37757
This commit is contained in:
Jakub Konka
2025-09-09 06:36:25 +00:00
committed by GitHub
parent 4b3b2acf75
commit 11d81b95d4
1 changed files with 6 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
crates/git/src/repository.rs
+6 -9
View File
@@ -1205,10 +1205,9 @@ impl GitRepository for RealGitRepository {
env: Arc<HashMap<String, String>>,
) -> 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<HashMap<String, String>>) -> 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<HashMap<String, String>>,
) -> 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?)