Skip to content

settings: Await config worktree before opening settings.json#47199

Merged
Veykril merged 1 commit intozed-industries:mainfrom
cppcoffee:settings
Feb 13, 2026
Merged

settings: Await config worktree before opening settings.json#47199
Veykril merged 1 commit intozed-industries:mainfrom
cppcoffee:settings

Conversation

@cppcoffee
Copy link
Contributor

Closes #47007

Release Notes:

  • Fixed await config worktree before opening settings.json

ensures that the worktree creation is awaited before attempting to open the settings file.

@cla-bot cla-bot bot added the cla-signed The user has signed the Contributor License Agreement label Jan 20, 2026
@everdrone
Copy link
Contributor

What's blocking this PR?
Would love to have the bug fixed. Right now even theme changes don't persist across project reopens if done on Windows.

Copy link
Member

@Veykril Veykril left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks!

@Veykril Veykril enabled auto-merge (squash) February 13, 2026 11:08
@Veykril
Copy link
Member

Veykril commented Feb 13, 2026

needs a rebase

Signed-off-by: Xiaobo Liu <cppcoffee@gmail.com>
auto-merge was automatically disabled February 13, 2026 11:36

Head branch was pushed to by a user without write access

@Veykril Veykril enabled auto-merge (squash) February 13, 2026 11:46
@Veykril Veykril merged commit 7687e1f into zed-industries:main Feb 13, 2026
27 checks passed
@cppcoffee cppcoffee deleted the settings branch February 13, 2026 13:32
Veykril added a commit that referenced this pull request Feb 28, 2026
Veykril added a commit that referenced this pull request Feb 28, 2026
…#50380)

Reverts #47199

Closes #50237

Release Notes:

- Fixed a bug that prevented settings files from opening on remotes
github-actions bot pushed a commit that referenced this pull request Feb 28, 2026
…#50380)

Reverts #47199

Closes #50237

Release Notes:

- Fixed a bug that prevented settings files from opening on remotes
github-actions bot pushed a commit that referenced this pull request Feb 28, 2026
…#50380)

Reverts #47199

Closes #50237

Release Notes:

- Fixed a bug that prevented settings files from opening on remotes
zed-zippy bot added a commit that referenced this pull request Feb 28, 2026
…#50380) (cherry-pick to preview) (#50382)

Cherry-pick of #50380 to preview

----
Reverts #47199

Closes #50237

Release Notes:

- Fixed a bug that prevented settings files from opening on remotes

Co-authored-by: Lukas Wirth <lukas@zed.dev>
zed-zippy bot added a commit that referenced this pull request Feb 28, 2026
…#50380) (cherry-pick to stable) (#50383)

Cherry-pick of #50380 to stable

----
Reverts #47199

Closes #50237

Release Notes:

- Fixed a bug that prevented settings files from opening on remotes

Co-authored-by: Lukas Wirth <lukas@zed.dev>
tahayvr pushed a commit to tahayvr/zed that referenced this pull request Mar 4, 2026
…zed-industries#50380)

Reverts zed-industries#47199

Closes zed-industries#50237

Release Notes:

- Fixed a bug that prevented settings files from opening on remotes
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

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Zed fails to open symlinked settings file on Windows

3 participants