3 people 45afbac0a5 Fix project grouping for Git repo subdirectories (#57998) ...

Self-Review Checklist:

- [x] I've reviewed my own diff for quality, security, and reliability
- [x] Unsafe blocks (if any) have justifying comments
  - No unsafe blocks added.
- [x] The content is consistent with the [UI/UX
checklist](https://github.com/zed-industries/zed/blob/main/CONTRIBUTING.md#uiux-checklist)
- No new UI components; behavior better matches user intent for opened
folders.
- [x] Tests cover the new/changed behavior
  - Added sibling-subdirectory project group regression coverage.
- Extended subfolder Git-status test to ensure Git still uses the parent
repo while project identity stays at the opened folder.
- [x] Performance impact has been considered and is acceptable
- Change adds one small enum/optional field check when computing
worktree paths; no meaningful performance impact expected.

Closes #57997

Release Notes:

- Fixed project grouping for opened subdirectories that share the same
parent Git repository.

## Screenshots

### Before
<img width="334" height="224" alt="Screenshot 2026-05-28 at 5 29 55 PM"
src="https://github.com/user-attachments/assets/ad5b13c5-11a7-4fa4-a074-a519521641da"
/>
<img width="485" height="201" alt="Screenshot 2026-05-28 at 5 28 36 PM"
src="https://github.com/user-attachments/assets/9cd2c138-92f5-4ff2-bf8f-21cdbeff0b79"
/>

### After

<img width="343" height="253" alt="Screenshot 2026-05-28 at 5 29 40 PM"
src="https://github.com/user-attachments/assets/56a4dca7-f0a1-4530-8c89-3c4773b90486"
/>
<img width="420" height="206" alt="Screenshot 2026-05-28 at 5 29 22 PM"
src="https://github.com/user-attachments/assets/d118340a-955e-4483-9888-4b566f59b931"
/>

---------

Co-authored-by: Anthony Eid <anthony@zed.dev>
Co-authored-by: Anthony Eid <56899983+Anthony-Eid@users.noreply.github.com>

2026-06-17 01:53:23 +00:00

..

context_server_store

gpui: Actually remove the Result from AsyncApp (#45809)

2026-01-07 12:48:24 -08:00

debugger

debugger: Fix running ignored Rust tests in nested modules (#54787)

2026-06-10 13:06:15 +00:00

git_store

Fix some overcomputation in the project diff (#57859)

2026-06-04 21:54:03 +00:00

lsp_command

project: Move tests to integration layer (#47596)

2026-01-25 21:35:32 +01:00

lsp_store

Anchor sticky scroll to symbol name rows (#56333)

2026-06-15 11:03:26 +00:00

manifest_tree

multi_buffer: Don't eagerly clone BufferSnapshot in range_to_buffer_ranges (#59190)

2026-06-12 12:27:28 +00:00

agent_registry_store.rs

acp: Prevent registry loading from hanging indefinitely (#56108)

2026-05-12 08:52:12 +00:00

agent_server_store.rs

acp: Support raw agent registry binaries (#58579)

2026-06-05 09:26:19 +00:00

bookmark_store.rs

Use unstable sorts if deduplicating (#58751)

2026-06-08 19:47:30 +00:00

buffer_store.rs

Merge gpui::Task and scheduler::Task (#53674)

2026-05-05 22:41:13 +00:00

color_extractor.rs

project: Move tests to integration layer (#47596)

2026-01-25 21:35:32 +01:00

connection_manager.rs

gpui: Actually remove the Result from AsyncApp (#45809)

2026-01-07 12:48:24 -08:00

context_server_store.rs

Settings UI agent providers (#58876)

2026-06-16 15:07:25 +00:00

debounced_delay.rs

chore: Bump Rust edition to 2024 (#27800)

2025-03-31 20:55:27 +02:00

debugger.rs

project: Move tests to integration layer (#47596)

2026-01-25 21:35:32 +01:00

environment.rs

terminal: Use system shell for non-terminal uses (like spinning up external agents) (#51741)

2026-04-21 08:06:40 +00:00

git_store.rs

Prevent archival of manually-created worktrees (#58275)

2026-06-16 15:36:59 +00:00

image_store.rs

Add support for Netpbm image previews (#54256)

2026-04-20 16:51:13 +03:00

lsp_command.rs

Support LSP document links (#56011)

2026-05-26 07:09:47 +00:00

lsp_store.rs

Improve didChangeWatchedFiles handler performance (#59078)

2026-06-10 23:52:00 +00:00

manifest_tree.rs

multi_buffer: Don't eagerly clone BufferSnapshot in range_to_buffer_ranges (#59190)

2026-06-12 12:27:28 +00:00

prettier_store.rs

node_runtime: Respect npm release-age filters for managed npm installs (#56957)

2026-05-18 21:10:06 +00:00

project_search.rs

project_search: Fix project search status text and refactor search state (#54753)

2026-04-24 10:45:16 +00:00

project_settings.rs

Implement MCP OAuth client preregistration (#52900)

2026-05-19 17:45:07 +00:00

project.rs

multi_buffer: Don't eagerly clone BufferSnapshot in range_to_buffer_ranges (#59190)

2026-06-12 12:27:28 +00:00

search_history.rs

Allow search/replace to span multiple lines (#50783)

2026-03-19 11:10:14 -06:00

search.rs

project: Normalize line endings in textual project search (#58628)

2026-06-05 10:44:29 +00:00

task_inventory.rs

multi_buffer: Don't eagerly clone BufferSnapshot in range_to_buffer_ranges (#59190)

2026-06-12 12:27:28 +00:00

task_store.rs

Fix "Run Debugger" failing silently when project does not compile (#52439)

2026-05-04 06:50:38 +00:00

telemetry_snapshot.rs

git: Add dev: show git job queue (#55904)

2026-05-07 15:56:32 +00:00

terminals.rs

remote: Do not swallow ssh errors (#58780)

2026-06-08 08:48:09 +00:00

toolchain_store.rs

multi_buffer: Don't eagerly clone BufferSnapshot in range_to_buffer_ranges (#59190)

2026-06-12 12:27:28 +00:00

trusted_worktrees.rs

Make restricted mode more obvious (#57056)

2026-05-18 16:18:59 +00:00

worktree_store.rs

Fix project grouping for Git repo subdirectories (#57998)

2026-06-17 01:53:23 +00:00

yarn.rs

project: Move tests to integration layer (#47596)

2026-01-25 21:35:32 +01:00