Merge pull request #2100 from zed-industries/visible-worktrees-in-collab-ui

Max Brunsfeld created 3 years ago

Omit hidden worktrees when showing projects in collaboration UI

Change summary

.github/workflows/ci.yml | 2 +-
crates/collab/src/db.rs  | 4 +++-
2 files changed, 4 insertions(+), 2 deletions(-)

Detailed changes

.github/workflows/ci.yml

@@ -4,7 +4,7 @@ on:
   push:
     branches:
       - main
-      - "v*"
+      - "v[0-9]+.[0-9]+.x"
     tags:
       - "v*"
   pull_request:

crates/collab/src/db.rs

@@ -1924,7 +1924,9 @@ impl Database {
                 };
 
                 if let Some(db_worktree) = db_worktree {
-                    project.worktree_root_names.push(db_worktree.root_name);
+                    if db_worktree.visible {
+                        project.worktree_root_names.push(db_worktree.root_name);
+                    }
                 }
             }
         }