From 42e74e7eefffe6375cbf7a58792e984ad23193cd Mon Sep 17 00:00:00 2001 From: Max Brunsfeld Date: Thu, 22 Dec 2022 11:18:10 -0800 Subject: [PATCH] Excluded deleted entries when initially sending worktrees to guests Co-authored-by: Antonio Scandurra --- crates/collab/src/db.rs | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/crates/collab/src/db.rs b/crates/collab/src/db.rs index 8b275bb680..31f6f9cd09 100644 --- a/crates/collab/src/db.rs +++ b/crates/collab/src/db.rs @@ -2390,7 +2390,11 @@ impl Database { // Populate worktree entries. { let mut db_entries = worktree_entry::Entity::find() - .filter(worktree_entry::Column::ProjectId.eq(project_id)) + .filter( + Condition::all() + .add(worktree_entry::Column::ProjectId.eq(project_id)) + .add(worktree_entry::Column::IsDeleted.eq(false)), + ) .stream(&*tx) .await?; while let Some(db_entry) = db_entries.next().await {