-
Notifications
You must be signed in to change notification settings - Fork 3.2k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Git blame fails from a worktree #19842
Labels
bug
[core label]
priority request
A request from a stakeholder or influential user
rust
Rust programming language support
workspace
Feedback for workspace management, layout, interactions, etc
Comments
fasterthanlime
added
admin read
Pending admin review
bug
[core label]
triage
Maintainer needs to classify the issue
labels
Oct 28, 2024
You can repro with something like: mkdir ~/gh-19842
cd ~/gh-19842
git clone https://github.com/fasterthanlime/hi
cd hi
git worktree add ../hi-worktree 6341517 Then open zed in Notably, the
(When you're done, don't forget to |
notpeter
added
workspace
Feedback for workspace management, layout, interactions, etc
rust
Rust programming language support
priority request
A request from a stakeholder or influential user
and removed
triage
Maintainer needs to classify the issue
admin read
Pending admin review
labels
Oct 28, 2024
github-actions
bot
added
admin read
Pending admin review
triage
Maintainer needs to classify the issue
labels
Nov 5, 2024
JosephTLyons
removed
triage
Maintainer needs to classify the issue
admin read
Pending admin review
labels
Nov 5, 2024
github-project-automation
bot
moved this from In Progress
to Done
in Quality Week Fall 2024
Nov 6, 2024
CharlesChen0823
pushed a commit
to CharlesChen0823/zed
that referenced
this issue
Nov 18, 2024
This adds support for [git worktrees](https://matklad.github.io/2024/07/25/git-worktrees.html). It fixes the errors that show up (git blame not working) and actually adds support for detecting git changes in a `.git` folder that's outside of our path (and not even in the ancestor chain of our root path). (While working on this we discovered that our `.gitignore` handling is not 100% correct. For example: we do stop processing `.gitignore` files once we found a `.git` repository and don't go further up the ancestors, which is correct, but then we also don't take into account the `excludesFile` that a user might have configured, see: https://git-scm.com/docs/gitignore) Closes zed-industries#19842 Closes zed-industries#4670 Release Notes: - Added support for git worktrees. Zed can now open git worktrees and the git status in them is correctly handled. --------- Co-authored-by: Antonio <antonio@zed.dev> Co-authored-by: Bennet <bennet@zed.dev>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Labels
bug
[core label]
priority request
A request from a stakeholder or influential user
rust
Rust programming language support
workspace
Feedback for workspace management, layout, interactions, etc
Check for existing issues
Describe the bug / provide steps to reproduce it
This happens when the "inline git blame" feature triggers. From the main repo, it works fine.
Environment
Zed: v0.159.1 (Zed Preview)
OS: macOS 15.0.1
Memory: 8 GiB
Architecture: aarch64
If applicable, add mockups / screenshots to help explain present your vision of the feature
No response
If applicable, attach your Zed.log file to this issue.
Zed.log
The text was updated successfully, but these errors were encountered: