mirrors/zed
1
0
Fork 0
mirror of https://github.com/zed-industries/zed.git synced 2024-12-04 22:54:24 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

Fix panic from unwrapping a relativize() (#6459)

Browse source 
Release Notes:

- Fixed a panic that could occur finding a git repository.
This commit is contained in:
Conrad Irwin 2024-01-24 23:03:41 -07:00 committed by GitHub
commit cf3b2ba146
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -970,7 +970,7 @@ impl LocalWorktree {
let mut index_task = None;
let snapshot = this.update(&mut cx, |this, _| this.as_local().unwrap().snapshot())?;
if let Some(repo) = snapshot.repository_for_path(&path) {
let repo_path = repo.work_directory.relativize(&snapshot, &path).unwrap();
if let Some(repo_path) = repo.work_directory.relativize(&snapshot, &path) {
if let Some(repo) = snapshot.git_repositories.get(&*repo.work_directory) {
let repo = repo.repo_ptr.clone();
index_task = Some(
@ -979,6 +979,7 @@ impl LocalWorktree {
);
}
}
}
let diff_base = if let Some(index_task) = index_task {
index_task.await