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

Be clearer about using GitFilesIncluded setting

Browse source
This commit is contained in:
Julia 2022-10-03 11:58:48 -04:00
parent 01176e04b7
commit 9427bb7553
1 changed files with 19 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

11
crates/project/src/worktree.rs
View file

@ -673,10 +673,8 @@ impl LocalWorktree {
cx.spawn(|this, mut cx| async move { cx.spawn(|this, mut cx| async move {
let text = fs.load(&abs_path).await?; let text = fs.load(&abs_path).await?;
let head_text = if matches!( let head_text = match files_included {
files_included, settings::GitFilesIncluded::All | settings::GitFilesIncluded::OnlyTracked => {
settings::GitFilesIncluded::All | settings::GitFilesIncluded::OnlyTracked
) {
let results = if let Some(repo) = snapshot.repo_for(&abs_path) { let results = if let Some(repo) = snapshot.repo_for(&abs_path) {
cx.background() cx.background()
.spawn({ .spawn({
@ -693,8 +691,9 @@ impl LocalWorktree {
} else { } else {
results results
} }
} else { }
None
settings::GitFilesIncluded::None => None,
}; };
// Eagerly populate the snapshot with an updated entry for the loaded file // Eagerly populate the snapshot with an updated entry for the loaded file