Skip to content

git: Add SSH support for removing and renaming git worktrees #50759

Merged
Anthony-Eid merged 6 commits intomainfrom
update-collab-rpc-docs
Mar 10, 2026
Merged

git: Add SSH support for removing and renaming git worktrees #50759
Anthony-Eid merged 6 commits intomainfrom
update-collab-rpc-docs

Conversation

@Anthony-Eid
Copy link
Copy Markdown
Contributor

@Anthony-Eid Anthony-Eid commented Mar 4, 2026

This should be the last step in implementing full git worktree support in the GitStore. We still need to add UI for that allows a user to rename a git worktree and, by extension git branches if we use the git picker to do so.

Also, I added a helper function called disallow_guest_request::<T> to the Collab::rpc that is used to specify a proto request isn't allowed to be sent by a guest. This enabled me to add a regression test that checks that a guest isn't allowed to delete a git worktree, without the test hanging forever because it's waiting for the proto server to respond.

Since SSH connections send the proto message directly from client to remote host, this won't affect those requests.

Before you mark this PR as ready for review, make sure that you have:

  • Added solid test coverage and/or screenshots from doing manual testing
  • Done a self-review taking into account security and performance aspects
  • Aligned any UI changes with the UI checklist

Release Notes:

  • git: Add SSH support for removing git worktrees

@cla-bot cla-bot bot added the cla-signed The user has signed the Contributor License Agreement label Mar 4, 2026
@zed-community-bot zed-community-bot bot added the staff Pull requests authored by a current member of Zed staff label Mar 4, 2026
@maxdeviant maxdeviant changed the title git: Add ssh support for removing and renaming git worktrees git: Add SSH support for removing and renaming git worktrees Mar 5, 2026
@Anthony-Eid Anthony-Eid marked this pull request as ready for review March 10, 2026 14:32
@Anthony-Eid Anthony-Eid enabled auto-merge (squash) March 10, 2026 14:52
@Anthony-Eid Anthony-Eid merged commit d18e4a7 into main Mar 10, 2026
28 checks passed
@Anthony-Eid Anthony-Eid deleted the update-collab-rpc-docs branch March 10, 2026 14:57
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

cla-signed The user has signed the Contributor License Agreement staff Pull requests authored by a current member of Zed staff

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant