From bf1525588dfba78491b0647a2102a54cd3212c62 Mon Sep 17 00:00:00 2001
From: Hendrik <7716993+DD5HT@users.noreply.github.com>
Date: Mon, 9 Dec 2024 02:44:46 +0100
Subject: [PATCH] Add .jj to default file exclusion (#21708)

Relates to #21538

Release Notes:

- Added `**/.jj` to the default file exclusion list.
---
 assets/settings/default.json             | 1 +
 crates/worktree/src/worktree_settings.rs | 1 +
 docs/src/configuring-zed.md              | 1 +
 3 files changed, 3 insertions(+)

diff --git a/assets/settings/default.json b/assets/settings/default.json
index 20819529ff6047ce29896d4b387d715b7681f849..3b785806108c9bebc5f728a9972dea712685ae2d 100644
--- a/assets/settings/default.json
+++ b/assets/settings/default.json
@@ -685,6 +685,7 @@
     "**/.git",
     "**/.svn",
     "**/.hg",
+    "**/.jj",
     "**/CVS",
     "**/.DS_Store",
     "**/Thumbs.db",
diff --git a/crates/worktree/src/worktree_settings.rs b/crates/worktree/src/worktree_settings.rs
index f26dc4af0fd7c3f3c32abff01c0840ea666f6485..9535264c92c4d56065efc27a59c7e7b46250daf1 100644
--- a/crates/worktree/src/worktree_settings.rs
+++ b/crates/worktree/src/worktree_settings.rs
@@ -40,6 +40,7 @@ pub struct WorktreeSettingsContent {
     ///   "**/.git",
     ///   "**/.svn",
     ///   "**/.hg",
+    ///   "**/.jj",
     ///   "**/CVS",
     ///   "**/.DS_Store",
     ///   "**/Thumbs.db",
diff --git a/docs/src/configuring-zed.md b/docs/src/configuring-zed.md
index d4f8c40dbdc7108d43d07a5868fffd5e09f60970..b51b01a1e7014d6c44b399205d5b90581aa34d4f 100644
--- a/docs/src/configuring-zed.md
+++ b/docs/src/configuring-zed.md
@@ -994,6 +994,7 @@ The result is still `)))` and not `))))))`, which is what it would be by default
   "**/.git",
   "**/.svn",
   "**/.hg",
+  "**/.jj"
   "**/CVS",
   "**/.DS_Store",
   "**/Thumbs.db",