Richard FeldmanandEric Holk
24019b0ae4
Create worktrees in detached HEAD state, then attempt to check out the requested branch. If the checkout fails (e.g. the branch is already in use by another worktree), log a warning and stay in detached HEAD state instead of showing an error to the user. This simplifies the worktree creation flow by: - Removing the occupied-branch fallback logic that would generate random branch names - Always using `CreateWorktreeTarget::Detached` for worktree creation - Attempting branch checkout as a best-effort post-creation step - Updating the branch picker UI to reflect the new behavior Release Notes: - Threads now start git worktrees in detached HEAD state if branch is in use or unspecified, instead of generating a random branch name. --------- Co-authored-by: Eric Holk <eric@zed.dev>
Zed
Welcome to Zed, a high-performance, multiplayer code editor from the creators of Atom and Tree-sitter.
Installation
On macOS, Linux, and Windows you can download Zed directly or install Zed via your local package manager (macOS/Linux/Windows).
Other platforms are not yet available:
- Web (tracking issue)
Developing Zed
Contributing
See CONTRIBUTING.md for ways you can contribute to Zed.
Also... we're hiring! Check out our jobs page for open roles.
Licensing
License information for third party dependencies must be correctly provided for CI to pass.
We use cargo-about to automatically comply with open source licenses. If CI is failing, check the following:
- Is it showing a
no license specifiederror for a crate you've created? If so, addpublish = falseunder[package]in your crate's Cargo.toml. - Is the error
failed to satisfy license requirementsfor a dependency? If so, first determine what license the project has and whether this system is sufficient to comply with this license's requirements. If you're unsure, ask a lawyer. Once you've verified that this system is acceptable add the license's SPDX identifier to theacceptedarray inscript/licenses/zed-licenses.toml. - Is
cargo-aboutunable to find the license for a dependency? If so, add a clarification field at the end ofscript/licenses/zed-licenses.toml, as specified in the cargo-about book.
Sponsorship
Zed is developed by Zed Industries, Inc., a for-profit company.
If you’d like to financially support the project, you can do so via GitHub Sponsors. Sponsorships go directly to Zed Industries and are used as general company revenue. There are no perks or entitlements associated with sponsorship.