Yehowshua/ZIm
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix git hunk staging on windows (#35755)

Browse source 
We were failing to flush the Git process's `stdin` before dropping it.

Release Notes:

- N/A
This commit is contained in:
Max Brunsfeld 2025-08-06 17:30:36 -07:00 • committed by GitHub
parent 8e290b446e
commit c595a7576d
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

14
crates/git/src/repository.rs
View file

@ -846,14 +846,12 @@ impl GitRepository for RealGitRepository {
.stdin(Stdio::piped())
.stdout(Stdio::piped())
.spawn()?;
child
.stdin
.take()
.unwrap()
.write_all(content.as_bytes())
.await?;
let mut stdin = child.stdin.take().unwrap();
stdin.write_all(content.as_bytes()).await?;
stdin.flush().await?;
drop(stdin);
let output = child.output().await?.stdout;
let sha = String::from_utf8(output)?;
let sha = str::from_utf8(&output)?.trim();
log::debug!("indexing SHA: {sha}, path {path:?}");
@ -871,6 +869,7 @@ impl GitRepository for RealGitRepository {
String::from_utf8_lossy(&output.stderr)
);
} else {
log::debug!("removing path {path:?} from the index");
let output = new_smol_command(&git_binary_path)
.current_dir(&working_directory)
.envs(env.iter())
@ -921,6 +920,7 @@ impl GitRepository for RealGitRepository {
for rev in &revs {
write!(&mut stdin, "{rev}\n")?;
}
stdin.flush()?;
drop(stdin);
let output = process.wait_with_output()?;