Gracefully handle when linked worktree .git path is outside worktree root#53443
Merged
Gracefully handle when linked worktree .git path is outside worktree root#53443
Conversation
…e root In update_git_repositories, a .git path outside the worktree root can occur legitimately when .git is a gitfile (as in linked worktrees and submodules) pointing to a directory in the parent repo. Previously this triggered a debug_panic. Now we skip it with a debug_assert that it is indeed a file, not a directory.
Member
|
@zed-zippy approve |
Contributor
Author
|
/cherry-pick preview |
github-actions bot
pushed a commit
that referenced
this pull request
Apr 9, 2026
…root (#53443) In `update_git_repositories`, a `.git` path outside the worktree root can occur legitimately when `.git` is a gitfile (as in linked worktrees and submodules) pointing to a directory in the parent repo. Previously this triggered a `debug_panic!`, crashing debug builds. Now we skip the path with a `debug_assert!` that it is indeed a file (not a directory), so a genuine `.git` directory outside the worktree root would still be caught in debug builds. (No release notes because this is extremely hard to encounter until #53215 lands) Release Notes: - N/A
zed-zippy bot
added a commit
that referenced
this pull request
Apr 9, 2026
…root (#53443) (cherry-pick to preview) (#53565) Cherry-pick of #53443 to preview ---- In `update_git_repositories`, a `.git` path outside the worktree root can occur legitimately when `.git` is a gitfile (as in linked worktrees and submodules) pointing to a directory in the parent repo. Previously this triggered a `debug_panic!`, crashing debug builds. Now we skip the path with a `debug_assert!` that it is indeed a file (not a directory), so a genuine `.git` directory outside the worktree root would still be caught in debug builds. (No release notes because this is extremely hard to encounter until #53215 lands) Release Notes: - N/A Co-authored-by: Richard Feldman <richard@zed.dev>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
In
update_git_repositories, a.gitpath outside the worktree root can occur legitimately when.gitis a gitfile (as in linked worktrees and submodules) pointing to a directory in the parent repo. Previously this triggered adebug_panic!, crashing debug builds.Now we skip the path with a
debug_assert!that it is indeed a file (not a directory), so a genuine.gitdirectory outside the worktree root would still be caught in debug builds.(No release notes because this is extremely hard to encounter until #53215 lands)
Release Notes: