mirror of
https://github.com/zed-industries/zed.git
synced 2026-10-19 11:04:06 +00:00
original uri https://github.com/zed-industries/zed
https://zed.dev
b47a4ca595
Some checks are pending
Congratsbot / check-author (push) Waiting to run
Congratsbot / congrats (push) Blocked by required conditions
deploy_nightly_docs / deploy_docs (push) Waiting to run
run_tests / orchestrate (push) Waiting to run
run_tests / check_style (push) Waiting to run
run_tests / clippy_windows (push) Blocked by required conditions
run_tests / clippy_linux (push) Blocked by required conditions
run_tests / clippy_mac (push) Blocked by required conditions
run_tests / clippy_mac_x86_64 (push) Blocked by required conditions
run_tests / run_tests_windows (push) Blocked by required conditions
run_tests / run_tests_linux (push) Blocked by required conditions
run_tests / run_tests_mac (push) Blocked by required conditions
run_tests / miri_scheduler (push) Blocked by required conditions
run_tests / doctests (push) Blocked by required conditions
run_tests / check_workspace_binaries (push) Blocked by required conditions
run_tests / check_wasm (push) Blocked by required conditions
run_tests / check_dependencies (push) Blocked by required conditions
run_tests / check_docs (push) Blocked by required conditions
run_tests / check_licenses (push) Blocked by required conditions
run_tests / check_scripts (push) Blocked by required conditions
run_tests / check_remote_server_linux_x86_64 (push) Blocked by required conditions
run_tests / check_remote_server_mac_aarch64 (push) Blocked by required conditions
run_tests / check_remote_server_windows_x86_64 (push) Blocked by required conditions
run_tests / check_postgres_and_protobuf_migrations (push) Blocked by required conditions
run_tests / extension_tests (push) Blocked by required conditions
run_tests / tests_pass (push) Blocked by required conditions
Closes #56525 # Objective Zed's branch picker shows a "Delete Branch" trash icon for both local and remote-tracking branches. For remote-tracking branches (e.g. `origin/feature`), this action only deletes the local tracking ref (`git branch -dr`) — it never contacts the remote, and the branch still exists on the actual remote repository. The label gives no indication of this, so users can't tell whether the action is local-only or will delete the branch upstream. ## Solution `Branch.is_remote()` was already used internally to pick the right git flag (`-d`/`-dr`) when deleting, but this distinction was never surfaced in the UI copy. This PR threads that same `is_remote` value through to the delete tooltip and branches the displayed text on it: - Local branch: unchanged — "Delete Branch" / "Force Delete Branch", with the existing "Hold alt to force delete" hint. - Remote-tracking branch: "Delete Local Tracking Branch" / "Force Delete Local Tracking Branch", with a "Does not delete the branch on the remote" hint. Also updated the stale `DeleteBranch`/`ForceDeleteBranch` action doc-comments, which still said "Deletes the selected git branch or remote" — a leftover from an earlier (already-fixed, see #48338) implementation that really did delete the whole remote config. No behavior change to the underlying delete logic — this is a copy-only fix that makes existing, correct behavior legible to the user, per [maintainer guidance on the issue](https://github.com/zed-industries/zed/issues/56525#issuecomment-5095069397). ## Testing - `cargo check -p git_ui` passes. - Manually verified in the branch picker: hovering the trash icon on a local branch shows the original text; hovering it on a `origin/...` remote-tracking branch shows the new "local tracking branch" text and meta line, for both the plain and alt-held (force) states. - No behavior/logic change, so no new automated test was added — purely a UI string change in `DeleteBranchTooltip::render`. - Reviewers: open a repo with at least one remote-tracking branch visible in the branch picker (`git fetch` a repo with a branch you don't have locally), hover the delete icon on it vs. on a local branch, and compare tooltip text. ## Self-Review Checklist: - [x] I've reviewed my own diff for quality, security, and reliability - [ ] Unsafe blocks (if any) have justifying comments - [x] The content adheres to Zed's UI standards ([UX/UI](https://github.com/zed-industries/zed/blob/main/CONTRIBUTING.md#uiux-checklist) and [icon](https://github.com/zed-industries/zed/blob/main/crates/icons/README.md) guidelines) - [ ] Tests cover the new/changed behavior - [x] Performance impact has been considered and is acceptable ## Showcase Before: hovering the trash icon on `origin/feature` shows "Delete Branch" / "Hold alt to force delete" — identical to a local branch, no indication the remote is untouched. After: hovering it shows "Delete Local Tracking Branch" with meta text "Does not delete the branch on the remote". --- Release Notes: - Improved the branch picker to clarify that deleting a remote-tracking branch only removes the local ref, and removed the force delete option for remote-tracking branches since it had no effect. --------- Co-authored-by: Agus Zubiaga <agus@zed.dev> Co-authored-by: Smit Barmase <heysmitbarmase@gmail.com> |
||
|---|---|---|
| .agents/skills | ||
| .cargo | ||
| .cloudflare | ||
| .config | ||
| .factory | ||
| .github | ||
| .wezel | ||
| .zed | ||
| assets | ||
| ci | ||
| crates | ||
| docs | ||
| extensions | ||
| legal | ||
| nix | ||
| script | ||
| tooling | ||
| .git-blame-ignore-revs | ||
| .gitattributes | ||
| .gitignore | ||
| .mailmap | ||
| .prettierrc | ||
| .rules | ||
| AGENTS.md | ||
| Cargo.lock | ||
| Cargo.toml | ||
| CLAUDE.md | ||
| clippy.toml | ||
| CODE_OF_CONDUCT.md | ||
| compose.yml | ||
| CONTRIBUTING.md | ||
| corgi.toml | ||
| default.nix | ||
| Dockerfile-collab | ||
| Dockerfile-collab.dockerignore | ||
| Dockerfile-cross.dockerignore | ||
| Dockerfile-distros | ||
| Dockerfile-distros.dockerignore | ||
| flake.lock | ||
| flake.nix | ||
| GEMINI.md | ||
| LICENSE-APACHE | ||
| LICENSE-GPL | ||
| Procfile | ||
| Procfile.web | ||
| README.md | ||
| rust-toolchain.toml | ||
| rustfmt.toml | ||
| shell.nix | ||
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 discussion)
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
Zed source code is licensed primarily under GPL-3.0-or-later, with Apache-2.0 components where marked.
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.