Remove std::fs::read_link in fs#50974
Conversation
|
We require contributors to sign our Contributor License Agreement, and we don't have @foxmsft on file. You can sign our CLA at https://zed.dev/cla. Once you've signed, post a comment here that says '@cla-bot check'. |
|
@cla-bot check |
|
We require contributors to sign our Contributor License Agreement, and we don't have @foxmsft on file. You can sign our CLA at https://zed.dev/cla. Once you've signed, post a comment here that says '@cla-bot check'. |
|
The cla-bot has been summoned, and re-checked this pull request! |
|
@reflectronic does this seem fine? I doubt |
|
@cla-bot check |
|
We require contributors to sign our Contributor License Agreement, and we don't have @foxmsft on file. You can sign our CLA at https://zed.dev/cla. Once you've signed, post a comment here that says '@cla-bot check'. |
|
The cla-bot has been summoned, and re-checked this pull request! |
|
@cla-bot check |
|
The cla-bot has been summoned, and re-checked this pull request! |
|
The function is meant to canonicalize the path (resolve symlinks, normalize case, etc.), so removing the The reason the function was so complex is that |
Closes zed-industries#46307 Before you mark this PR as ready for review, make sure that you have: - [ ] Added a solid test coverage and/or screenshots from doing manual testing - [X] Done a self-review taking into account security and performance aspects - [ ] Aligned any UI changes with the [UI checklist](https://github.com/zed-industries/zed/blob/main/CONTRIBUTING.md#uiux-checklist) Release Notes: - Improved compatibility with mounted VHDs on Windows. --------- Co-authored-by: John Tur <john-tur@outlook.com>
…Windows (#51453) Closes #47007 After #50974, symlinked `settings.json` can be opened and saved, but the worktree ends up rooted at the file itself rather than its parent directory, which causes this error to be logged when changing settings via the settings GUI: ``` 2026-03-18T22:24:05+01:00 ERROR [worktree] ignoring event "C:\\Users\\Bryan\\dev\\bryanpth\\dotfiles\\config\\zed\\settings.json~RF1ab7ae0.TMP" outside of root path "C:\\Users\\Bryan\\dev\\bryanpth\\dotfiles\\config\\zed\\settings.json" ``` Fixed by canonicalizing the symlink path before passing to `open_paths`. Tested with a symlinked settings.json, both directly and through WSL. Release Notes: - Fixed incorrect worktree root when settings.json is a symlink on Windows
Closes #46307
Before you mark this PR as ready for review, make sure that you have:
Release Notes: