Skip to content

Improve bare repo support (#55153) (cherry-pick to preview) - #55680

Merged
zed-zippy[bot] merged 1 commit into
v1.1.xfrom
cherry-pick-v1.1.x-caccc65b
May 4, 2026
Merged

zed-zippy[bot] merged 1 commit into
v1.1.xfrom
cherry-pick-v1.1.x-caccc65b

Conversation

@zed-zippy

@zed-zippy zed-zippy Bot commented May 4, 2026

Copy link
Copy Markdown
Contributor

Cherry-pick of #55153 to preview


Fixes #54830

This fixes a bugs where

  • when there's no main worktree, we treated the first linked worktree as
    main
  • the titlebar and sidebar showed two different things when opening a
    linked wortree directly

When there's no main worktree, our "project group key" will be the bare
repo path. For displaying this to the user, we try to present something
meaningful:

  • If the bare repo is foo.git, we'll say "foo"
  • If the bare repo is "bar/.bare", we'll "bar"

Release Notes:

  • Fixed bugs in Zed's sidebar and titlebar when editing in git worktrees
    created from bare repositories.

Fixes #54830

This fixes a bugs where
* when there's no main worktree, we treated the first linked worktree as
main
* the titlebar and sidebar showed two different things when opening a
linked wortree directly

When there's no main worktree, our "project group key" will be the bare
repo path. For displaying this to the user, we try to present something
meaningful:
* If the bare repo is `foo.git`, we'll say "foo"
* If the bare repo is "bar/.bare", we'll "bar"

Release Notes:

- Fixed bugs in Zed's sidebar and titlebar when editing in git worktrees
created from bare repositories.
@cla-bot cla-bot Bot added the cla-signed The user has signed the Contributor License Agreement label May 4, 2026
@zed-community-bot zed-community-bot Bot added the bot Pull requests authored by a bot label May 4, 2026
@zed-zippy
zed-zippy Bot merged commit 8af115d into v1.1.x May 4, 2026
39 checks passed
@zed-zippy
zed-zippy Bot deleted the cherry-pick-v1.1.x-caccc65b branch May 4, 2026 16:57
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

bot Pull requests authored by a bot cla-signed The user has signed the Contributor License Agreement

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant