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

Save open buffers before staging or unstaging their backing files (#24767)

Browse source 
Release Notes:

- N/A
This commit is contained in:
Cole Miller 2025-02-13 10:07:28 -05:00 • committed by GitHub
parent 2db5eed840
commit de0d9d678e
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 89 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

13
crates/git_ui/src/git_panel.rs
View file

@ -749,14 +749,14 @@ impl GitPanel {
let result = cx
.update(|cx| {
if stage {
active_repository.read(cx).stage_entries(repo_paths.clone())
active_repository
.update(cx, |repo, cx| repo.stage_entries(repo_paths.clone(), cx))
} else {
active_repository
.read(cx)
.unstage_entries(repo_paths.clone())
.update(cx, |repo, cx| repo.unstage_entries(repo_paths.clone(), cx))
}
})?
.await?;
.await;
this.update(&mut cx, |this, cx| {
for pending in this.pending.iter_mut() {
@ -849,9 +849,10 @@ impl GitPanel {
return;
}
let stage_task = active_repository.read(cx).stage_entries(changed_files);
let stage_task =
active_repository.update(cx, |repo, cx| repo.stage_entries(changed_files, cx));
cx.spawn(|_, mut cx| async move {
stage_task.await??;
stage_task.await?;
let commit_task = active_repository
.update(&mut cx, |repo, _| repo.commit(message.into(), None))?;
commit_task.await?