Skip to content

Commit

Permalink
SSH remoting: Don't panic when opening root, open ~ instead (zed-indu…
Browse files Browse the repository at this point in the history
…stries#19322)

Release Notes:

- Fixed a panic when doing `zed ssh://server/`
  • Loading branch information
ConradIrwin authored Oct 16, 2024
1 parent 0c04fb9 commit c888101
Showing 1 changed file with 6 additions and 6 deletions.
12 changes: 6 additions & 6 deletions crates/project/src/worktree_store.rs
Original file line number Diff line number Diff line change
Expand Up @@ -247,14 +247,9 @@ impl WorktreeStore {
if abs_path.starts_with("/~") {
abs_path = abs_path[1..].to_string();
}
if abs_path.is_empty() {
if abs_path.is_empty() || abs_path == "/" {
abs_path = "~/".to_string();
}
let root_name = PathBuf::from(abs_path.clone())
.file_name()
.unwrap()
.to_string_lossy()
.to_string();
cx.spawn(|this, mut cx| async move {
let this = this.upgrade().context("Dropped worktree store")?;

Expand All @@ -272,6 +267,11 @@ impl WorktreeStore {
return Ok(existing_worktree);
}

let root_name = PathBuf::from(&response.canonicalized_path)
.file_name()
.map(|n| n.to_string_lossy().to_string())
.unwrap_or(response.canonicalized_path.to_string());

let worktree = cx.update(|cx| {
Worktree::remote(
SSH_PROJECT_ID,
Expand Down

0 comments on commit c888101

Please sign in to comment.