oak-team/oak-gpui
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
Files
e5660d25f1733c2894160950a91f041684b88f2a
oak-gpui/crates
T
History
Alvaro ParkerandCole Miller e5660d25f1 git: Add git worktree picker (#38719) 
Related discussions #26084 

Worktree creations are implemented similar to how branch creations are
handled on the branch picker (the user types a new name that's not on
the list and a new entry option appears to create a new branch with that
name).


https://github.com/user-attachments/assets/39e58983-740c-4a91-be88-57ef95aed85b

With this picker you have a few workflows: 

- Open the picker and type the name of a branch that's checked out on an
existing worktree:
    - Press enter to open the worktree on a new window
- Press ctrl-enter to open the worktree and replace the current window
- Open the picker and type the name of a new branch or an existing one
that's not checked out in another worktree:
- Press enter to create the worktree and open in a new window. If the
branch doesn't exists, we will create a new one based on the branch you
have currently checked out. If the branch does exists then we create a
worktree with that branch checked out.
- Press ctrl-enter to do everything on the previous point but instead,
replace the current window with the new worktre.
- Open the picker and type the name of a new branch or an existing one
that's not checked out in another worktree:
- If a default branch is detected on the repo, you can create a new
worktree based on that branch by pressing ctrl-enter or
ctrl-shift-enter. The first one will open a new window and the last one
will replace the current one.


Note: If you preffer to not use the system prompt for choosing a
directory, you can set `"use_system_path_prompts": false` in zed
settings.

Release Notes:

- Added git worktree picker to open a git worktree on a new window or
replace the current one
- Added git worktree creation action

---------

Co-authored-by: Cole Miller <cole@zed.dev>
2025-11-03 21:38:00 -05:00
..
acp_thread
Revert "sum_tree: Replace rayon with futures (#41586) (#41846)
2025-11-03 19:25:15 +00:00
acp_tools
acp_tools: Add vertical scrollbar to ACP logs (#41740)
2025-11-02 18:11:21 +00:00
action_log
Revert "sum_tree: Replace rayon with futures (#41586) (#41846)
2025-11-03 19:25:15 +00:00
activity_indicator
Support numeric tokens in work report LSP requests (#41448)
2025-10-29 19:35:16 +00:00
agent
Revert "sum_tree: Replace rayon with futures (#41586) (#41846)
2025-11-03 19:25:15 +00:00
agent_servers
acp: Start sending Client Info to the Agent (#41265)
2025-10-27 10:05:50 +00:00
agent_settings
settings: Remove unused stream_edits setting in agent (#40640)
2025-10-19 15:52:28 +00:00
agent_ui
agent_ui: Add profiles item in the panel menu (#41871)
2025-11-03 22:54:28 -03:00
ai_onboarding
ai onboarding: Add dismiss button to the sign in banner (#40660)
2025-10-20 08:35:28 -03:00
anthropic
Remove workspace-hack (#40216)
2025-10-17 18:58:14 +00:00
askpass
Use ShellKind::try_quote whenever we need to quote shell args (#41104)
2025-10-24 18:19:53 +02:00
assets
Remove workspace-hack (#40216)
2025-10-17 18:58:14 +00:00
assistant_slash_command
Remove workspace-hack (#40216)
2025-10-17 18:58:14 +00:00
assistant_slash_commands
Reduce display_map snapshot creation (#39354)
2025-10-17 21:56:57 +02:00
assistant_text_thread
Revert "sum_tree: Replace rayon with futures (#41586) (#41846)
2025-11-03 19:25:15 +00:00
audio
ci: Update typos versions and fix new occurrences (#40784)
2025-10-21 10:43:22 +00:00
auto_update
windows: Hide background helpers behind CREATE_NO_WINDOW (#41737)
2025-11-02 09:15:01 +01:00
auto_update_helper
Adjust Windows fusion manifests (#41408)
2025-10-28 20:21:31 -04:00
auto_update_ui
Remove workspace-hack (#40216)
2025-10-17 18:58:14 +00:00
aws_http_client
Remove workspace-hack (#40216)
2025-10-17 18:58:14 +00:00
bedrock
bedrock: Add support for Claude Haiku 4.5 model (#41045)
2025-10-29 16:41:43 +01:00
breadcrumbs
project_search: Add button to collapse/expand all excerpts (#41654)
2025-11-03 14:50:34 -03:00
buffer_diff
Revert "sum_tree: Replace rayon with futures (#41586) (#41846)
2025-11-03 19:25:15 +00:00
call
Remove workspace-hack (#40216)
2025-10-17 18:58:14 +00:00
channel
Revert "sum_tree: Replace rayon with futures (#41586) (#41846)
2025-11-03 19:25:15 +00:00
cli
rope: Prevent stack overflows by bumping rayon stack sizes (#41397)
2025-10-28 20:21:49 +00:00
client
ci: Update typos versions and fix new occurrences (#40784)
2025-10-21 10:43:22 +00:00
clock
ci: Update typos versions and fix new occurrences (#40784)
2025-10-21 10:43:22 +00:00
cloud_api_client
Remove workspace-hack (#40216)
2025-10-17 18:58:14 +00:00
cloud_api_types
Remove workspace-hack (#40216)
2025-10-17 18:58:14 +00:00
cloud_llm_client
Add zeta-cli subcommand for running zeta2 predictions (#41722)
2025-11-03 15:12:08 -08:00
cloud_zeta2_prompt
zeta cli: Add convert-example command (#41608)
2025-11-01 19:35:04 +00:00
codestral
edit prediction: Add ability to switch providers from the status bar menu (#41504)
2025-10-29 22:16:13 -03:00
collab
Revert "sum_tree: Replace rayon with futures (#41586) (#41846)
2025-11-03 19:25:15 +00:00
collab_ui
collab panel: Open selected channel notes (#41560)
2025-10-30 13:10:19 +00:00
collections
Remove workspace-hack (#40216)
2025-10-17 18:58:14 +00:00
command_palette
command palette: Make footer buttons justified to the right (#41382)
2025-10-28 16:15:44 -03:00
command_palette_hooks
Remove workspace-hack (#40216)
2025-10-17 18:58:14 +00:00
component
Remove workspace-hack (#40216)
2025-10-17 18:58:14 +00:00
context_server
Remove workspace-hack (#40216)
2025-10-17 18:58:14 +00:00
copilot
Add support for GitHub Copilot /responses endpoint (#40762)
2025-10-24 13:25:58 -06:00
crashes
crashes: Avoid crash handler on detached threads (#40883)
2025-10-23 21:04:22 +00:00
credentials_provider
Remove workspace-hack (#40216)
2025-10-17 18:58:14 +00:00
dap
Remove workspace-hack (#40216)
2025-10-17 18:58:14 +00:00
dap_adapters
debugger: Add program and module path fallbacks for debugpy toolchain (#40975)
2025-11-01 17:30:13 -04:00
db
Remove workspace-hack (#40216)
2025-10-17 18:58:14 +00:00
debug_adapter_extension
Remove workspace-hack (#40216)
2025-10-17 18:58:14 +00:00
debugger_tools
Keep selection in SwitchToHelixNormalMode (#41583)
2025-10-31 01:53:46 +00:00
debugger_ui
editor: Add support for no scroll margin in full mode (#41838)
2025-11-03 20:47:39 +01:00
deepseek
Remove workspace-hack (#40216)
2025-10-17 18:58:14 +00:00
denoise
Remove workspace-hack (#40216)
2025-10-17 18:58:14 +00:00
diagnostics
Revert "sum_tree: Replace rayon with futures (#41586) (#41846)
2025-11-03 19:25:15 +00:00
docs_preprocessor
docs: Ensure macOS and Linux keybindings are escaped in HTML (#39802)
2025-10-23 14:13:35 -04:00
edit_prediction
Remove workspace-hack (#40216)
2025-10-17 18:58:14 +00:00
edit_prediction_button
Revert "sum_tree: Replace rayon with futures (#41586) (#41846)
2025-11-03 19:25:15 +00:00
edit_prediction_context
ci: Update typos versions and fix new occurrences (#40784)
2025-10-21 10:43:22 +00:00
editor
Do not pull diagnostics when those are disabled (#41865)
2025-11-03 22:42:26 +00:00
eval
eval: Port to agent2 (#40704)
2025-10-22 17:55:26 +00:00
explorer_command_injector
Remove workspace-hack (#40216)
2025-10-17 18:58:14 +00:00
extension
Shell out to real tar in extension builder (#41856)
2025-11-03 16:13:03 -07:00
extension_api
Windows: Fix issues with paths in extensions (#37811)
2025-09-11 13:56:06 -07:00
extension_cli
Fix categorization of agent server extensions (#41689)
2025-10-31 21:18:22 +00:00
extension_host
Revert "sum_tree: Replace rayon with futures (#41586) (#41846)
2025-11-03 19:25:15 +00:00
extensions_ui
extension_ui: Fix card label truncation (#41784)
2025-11-03 03:54:47 +00:00
feature_flags
Remove workspace-hack (#40216)
2025-10-17 18:58:14 +00:00
feedback
Remove workspace-hack (#40216)
2025-10-17 18:58:14 +00:00
file_finder
file_finder: Fix highlighting panic in open path prompt (#41808)
2025-11-03 12:07:13 +00:00
file_icons
Remove workspace-hack (#40216)
2025-10-17 18:58:14 +00:00
fs
git: Add git worktree picker (#38719)
2025-11-03 21:38:00 -05:00
fs_benchmarks
fs: Reintroduce benchmarks crate (#40689)
2025-10-20 10:30:06 +00:00
fsevent
Remove workspace-hack (#40216)
2025-10-17 18:58:14 +00:00
fuzzy
file_finder: Include worktree root name in multi-worktrees workspace (#40415)
2025-10-20 23:54:56 +03:00
git
git: Add git worktree picker (#38719)
2025-11-03 21:38:00 -05:00
git_hosting_providers
Support GitLab and self-hosted GitLab avatars in git blame (#41747)
2025-11-03 07:51:04 +01:00
git_ui
git: Add git worktree picker (#38719)
2025-11-03 21:38:00 -05:00
go_to_line
Reduce amount of foreground tasks spawned on multibuffer/editor updates (#41479)
2025-10-30 17:40:56 +00:00
google_ai
Remove workspace-hack (#40216)
2025-10-17 18:58:14 +00:00
gpui
editor: Add a setting to show a scrollbar in completion menu (#41849)
2025-11-03 21:03:18 +00:00
gpui_macros
Remove workspace-hack (#40216)
2025-10-17 18:58:14 +00:00
gpui_tokio
workspace: Handle non-cloneable items better (#41215)
2025-10-26 13:24:26 +00:00
html_to_markdown
Remove workspace-hack (#40216)
2025-10-17 18:58:14 +00:00
http_client
Remove workspace-hack (#40216)
2025-10-17 18:58:14 +00:00
http_client_tls
Remove workspace-hack (#40216)
2025-10-17 18:58:14 +00:00
icons
agent_ui: Improve display of external agents in configuration view (#41869)
2025-11-03 22:22:50 -03:00
image_viewer
workspace: Handle non-cloneable items better (#41215)
2025-10-26 13:24:26 +00:00
inspector_ui
Remove workspace-hack (#40216)
2025-10-17 18:58:14 +00:00
install_cli
Remove workspace-hack (#40216)
2025-10-17 18:58:14 +00:00
journal
Remove workspace-hack (#40216)
2025-10-17 18:58:14 +00:00
json_schema_store
Remove workspace-hack (#40216)
2025-10-17 18:58:14 +00:00
keymap_editor
editor: Add support for no scroll margin in full mode (#41838)
2025-11-03 20:47:39 +01:00
language
Revert "sum_tree: Replace rayon with futures (#41586) (#41846)
2025-11-03 19:25:15 +00:00
language_extension
Revert "sum_tree: Replace rayon with futures (#41586) (#41846)
2025-11-03 19:25:15 +00:00
language_model
ci: Update typos versions and fix new occurrences (#40784)
2025-10-21 10:43:22 +00:00
language_models
ollama: Add button for refreshing available models (#38181)
2025-10-31 18:12:02 +00:00
language_onboarding
Remove workspace-hack (#40216)
2025-10-17 18:58:14 +00:00
language_selector
Fix keybind hints flickering in certain scenarios (#40927)
2025-10-22 19:52:38 +00:00
language_tools
Keep selection in SwitchToHelixNormalMode (#41583)
2025-10-31 01:53:46 +00:00
languages
Copy outline improvements from typescript over to tsx as well (#41862)
2025-11-03 14:38:05 -08:00
line_ending_selector
Fix keybind hints flickering in certain scenarios (#40927)
2025-10-22 19:52:38 +00:00
livekit_api
Remove workspace-hack (#40216)
2025-10-17 18:58:14 +00:00
livekit_client
Remove workspace-hack (#40216)
2025-10-17 18:58:14 +00:00
lmstudio
Remove workspace-hack (#40216)
2025-10-17 18:58:14 +00:00
lsp
Remove workspace-hack (#40216)
2025-10-17 18:58:14 +00:00
markdown
Revert "sum_tree: Replace rayon with futures (#41586) (#41846)
2025-11-03 19:25:15 +00:00
markdown_preview
Revert "sum_tree: Replace rayon with futures (#41586) (#41846)
2025-11-03 19:25:15 +00:00
media
Remove workspace-hack (#40216)
2025-10-17 18:58:14 +00:00
menu
Remove workspace-hack (#40216)
2025-10-17 18:58:14 +00:00
migrator
Revert "Support relative line number on wrapped lines (#39268)" (#41450)
2025-10-29 11:07:23 +00:00
mistral
Remove workspace-hack (#40216)
2025-10-17 18:58:14 +00:00
multi_buffer
Revert "sum_tree: Replace rayon with futures (#41586) (#41846)
2025-11-03 19:25:15 +00:00
nc
Remove workspace-hack (#40216)
2025-10-17 18:58:14 +00:00
net
Remove workspace-hack (#40216)
2025-10-17 18:58:14 +00:00
node_runtime
Remove workspace-hack (#40216)
2025-10-17 18:58:14 +00:00
notifications
sum_tree: Implement recursive Sumtree::find, use it over Cursor::seek if possible (#40700)
2025-10-20 17:20:09 +00:00
ollama
Remove workspace-hack (#40216)
2025-10-17 18:58:14 +00:00
onboarding
workspace: Handle non-cloneable items better (#41215)
2025-10-26 13:24:26 +00:00
open_ai
Remove workspace-hack (#40216)
2025-10-17 18:58:14 +00:00
open_router
Remove workspace-hack (#40216)
2025-10-17 18:58:14 +00:00
outline
Reduce display_map snapshot creation (#39354)
2025-10-17 21:56:57 +02:00
outline_panel
Fix incorrect search ranges when rendering search matches in the outline panel (#41859)
2025-11-03 22:01:52 +00:00
panel
Remove workspace-hack (#40216)
2025-10-17 18:58:14 +00:00
paths
Use paths::external_agents_dir (#41286)
2025-10-27 15:24:44 +00:00
picker
Increased the max height of pickers (#41617)
2025-10-31 04:26:36 +00:00
prettier
Remove workspace-hack (#40216)
2025-10-17 18:58:14 +00:00
project
git: Add git worktree picker (#38719)
2025-11-03 21:38:00 -05:00
project_panel
project panel: Remove extra separator when "Rename" is hidden (#41639)
2025-10-31 13:55:08 +00:00
project_symbols
Remove workspace-hack (#40216)
2025-10-17 18:58:14 +00:00
prompt_store
prompt_store: Remove unused code (#41473)
2025-10-29 16:27:30 +00:00
proto
git: Add git worktree picker (#38719)
2025-11-03 21:38:00 -05:00
recent_projects
git: Add git worktree picker (#38719)
2025-11-03 21:38:00 -05:00
refineable
Remove workspace-hack (#40216)
2025-10-17 18:58:14 +00:00
release_channel
Remove workspace-hack (#40216)
2025-10-17 18:58:14 +00:00
remote
remote: Fix more quoting issues with nushell (#41547)
2025-11-03 10:50:05 +00:00
remote_server
Revert "sum_tree: Replace rayon with futures (#41586) (#41846)
2025-11-03 19:25:15 +00:00
repl
Propagate Jupyter client errors (#40886)
2025-10-28 14:45:27 +00:00
reqwest_client
Remove workspace-hack (#40216)
2025-10-17 18:58:14 +00:00
rich_text
Revert "sum_tree: Replace rayon with futures (#41586) (#41846)
2025-11-03 19:25:15 +00:00
rope
Revert "sum_tree: Replace rayon with futures (#41586) (#41846)
2025-11-03 19:25:15 +00:00
rpc
ACP Extensions (#40663)
2025-10-24 07:52:51 -04:00
rules_library
Revert "sum_tree: Replace rayon with futures (#41586) (#41846)
2025-11-03 19:25:15 +00:00
scheduler
Remove workspace-hack (#40216)
2025-10-17 18:58:14 +00:00
schema_generator
Remove workspace-hack (#40216)
2025-10-17 18:58:14 +00:00
search
project_search: Add button to collapse/expand all excerpts (#41654)
2025-11-03 14:50:34 -03:00
semantic_version
Remove workspace-hack (#40216)
2025-10-17 18:58:14 +00:00
session
Remove workspace-hack (#40216)
2025-10-17 18:58:14 +00:00
settings
editor: Add a setting to show a scrollbar in completion menu (#41849)
2025-11-03 21:03:18 +00:00
settings_json
settings_ui: Show migration banner (#41112)
2025-10-27 10:13:26 -04:00
settings_macros
Remove workspace-hack (#40216)
2025-10-17 18:58:14 +00:00
settings_profile_selector
Remove workspace-hack (#40216)
2025-10-17 18:58:14 +00:00
settings_ui
editor: Add a setting to show a scrollbar in completion menu (#41849)
2025-11-03 21:03:18 +00:00
snippet
Remove workspace-hack (#40216)
2025-10-17 18:58:14 +00:00
snippet_provider
Remove workspace-hack (#40216)
2025-10-17 18:58:14 +00:00
snippets_ui
Remove workspace-hack (#40216)
2025-10-17 18:58:14 +00:00
sqlez
Remove workspace-hack (#40216)
2025-10-17 18:58:14 +00:00
sqlez_macros
Remove workspace-hack (#40216)
2025-10-17 18:58:14 +00:00
story
Remove workspace-hack (#40216)
2025-10-17 18:58:14 +00:00
storybook
Remove workspace-hack (#40216)
2025-10-17 18:58:14 +00:00
streaming_diff
Revert "sum_tree: Replace rayon with futures (#41586) (#41846)
2025-11-03 19:25:15 +00:00
sum_tree
Revert "sum_tree: Replace rayon with futures (#41586) (#41846)
2025-11-03 19:25:15 +00:00
supermaven
Remove workspace-hack (#40216)
2025-10-17 18:58:14 +00:00
supermaven_api
Remove workspace-hack (#40216)
2025-10-17 18:58:14 +00:00
svg_preview
svg_preview: Update preview on every buffer edit (#41270)
2025-10-29 18:49:39 +01:00
system_specs
Remove workspace-hack (#40216)
2025-10-17 18:58:14 +00:00
tab_switcher
Fix tab switcher spacing bug (#41329)
2025-10-28 03:00:55 -04:00
task
Use ShellKind::try_quote whenever we need to quote shell args (#41104)
2025-10-24 18:19:53 +02:00
tasks_ui
Show modal hover for one-off tasks (#41824)
2025-11-03 15:25:44 +00:00
telemetry
Remove workspace-hack (#40216)
2025-10-17 18:58:14 +00:00
telemetry_events
Remove workspace-hack (#40216)
2025-10-17 18:58:14 +00:00
terminal
terminal: Kill the terminal child process, not the terminal process on exit (#41631)
2025-10-31 15:01:50 +00:00
terminal_view
terminal: Kill the terminal child process, not the terminal process on exit (#41631)
2025-10-31 15:01:50 +00:00
text
Revert "sum_tree: Replace rayon with futures (#41586) (#41846)
2025-11-03 19:25:15 +00:00
theme
theme: Fix entry could appear transparent on hover with certain themes (#40944)
2025-10-23 04:23:25 +05:30
theme_extension
Remove workspace-hack (#40216)
2025-10-17 18:58:14 +00:00
theme_importer
Remove workspace-hack (#40216)
2025-10-17 18:58:14 +00:00
theme_selector
Remove workspace-hack (#40216)
2025-10-17 18:58:14 +00:00
time_format
Remove workspace-hack (#40216)
2025-10-17 18:58:14 +00:00
title_bar
windows: Fix click bleeding through collab follow (#41726)
2025-11-02 07:35:11 +00:00
toolchain_selector
Fix keybind hints flickering in certain scenarios (#40927)
2025-10-22 19:52:38 +00:00
ui
editor: Add a setting to show a scrollbar in completion menu (#41849)
2025-11-03 21:03:18 +00:00
ui_input
ui_input: Don’t focus previous on decrement in NumberField (#41095)
2025-10-24 14:03:01 +00:00
ui_macros
Remove workspace-hack (#40216)
2025-10-17 18:58:14 +00:00
ui_prompt
Remove workspace-hack (#40216)
2025-10-17 18:58:14 +00:00
util
remote: Fix more quoting issues with nushell (#41547)
2025-11-03 10:50:05 +00:00
util_macros
Remove workspace-hack (#40216)
2025-10-17 18:58:14 +00:00
vercel
Remove workspace-hack (#40216)
2025-10-17 18:58:14 +00:00
vim
Revert "sum_tree: Replace rayon with futures (#41586) (#41846)
2025-11-03 19:25:15 +00:00
vim_mode_setting
Remove workspace-hack (#40216)
2025-10-17 18:58:14 +00:00
watch
Remove workspace-hack (#40216)
2025-10-17 18:58:14 +00:00
web_search
Remove workspace-hack (#40216)
2025-10-17 18:58:14 +00:00
web_search_providers
Remove workspace-hack (#40216)
2025-10-17 18:58:14 +00:00
workspace
Revert "sum_tree: Replace rayon with futures (#41586) (#41846)
2025-11-03 19:25:15 +00:00
worktree
Revert "sum_tree: Replace rayon with futures (#41586) (#41846)
2025-11-03 19:25:15 +00:00
worktree_benchmarks
Remove workspace-hack (#40216)
2025-10-17 18:58:14 +00:00
x_ai
Remove workspace-hack (#40216)
2025-10-17 18:58:14 +00:00
zed
Revert "sum_tree: Replace rayon with futures (#41586) (#41846)
2025-11-03 19:25:15 +00:00
zed_actions
git: Add git worktree picker (#38719)
2025-11-03 21:38:00 -05:00
zed_env_vars
Remove workspace-hack (#40216)
2025-10-17 18:58:14 +00:00
zeta
Revert "sum_tree: Replace rayon with futures (#41586) (#41846)
2025-11-03 19:25:15 +00:00
zeta2
Add zeta-cli subcommand for running zeta2 predictions (#41722)
2025-11-03 15:12:08 -08:00
zeta2_tools
Add zeta-cli subcommand for running zeta2 predictions (#41722)
2025-11-03 15:12:08 -08:00
zeta_cli
Add zeta-cli subcommand for running zeta2 predictions (#41722)
2025-11-03 15:12:08 -08:00
zlog
svg_preview: Update preview on every buffer edit (#41270)
2025-10-29 18:49:39 +01:00
zlog_settings
Remove workspace-hack (#40216)
2025-10-17 18:58:14 +00:00