vndangkhoa/zed
1
0
Fork 0
mirror of https://github.com/zed-industries/zed.git synced 2026-06-01 03:14:56 +07:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

project: Load git diff bases concurrently (#55480)

Browse source 
Use `future::join` when loading index and committed text for buffer diff
bases, while keeping skipped loads as ready None futures.

Release Notes:

- N/A

Signed-off-by: Xiaobo Liu <cppcoffee@gmail.com>
This commit is contained in:
Xiaobo Liu 2026-05-05 11:06:37 +08:00 committed by GitHub
parent c958a12bcc
commit 8d153d7feb
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
crates/project/src/git_store.rs
View file

@ -4565,15 +4565,16 @@ impl Repository {
&repo_diff_state_updates
{
let index_text = if current_index_text.is_some() {
backend.load_index_text(repo_path.clone()).await
backend.load_index_text(repo_path.clone())
} else {
None
future::ready(None).boxed()
};
let head_text = if current_head_text.is_some() {
backend.load_committed_text(repo_path.clone()).await
backend.load_committed_text(repo_path.clone())
} else {
None
future::ready(None).boxed()
};
let (index_text, head_text) = future::join(index_text, head_text).await;
let change =
match (current_index_text.as_ref(), current_head_text.as_ref()) {