fix(git_status): Fix worktree not found when use_file_path=true#3417
Open
P4Cu wants to merge 1 commit intonvim-telescope:masterfrom
Open
fix(git_status): Fix worktree not found when use_file_path=true#3417P4Cu wants to merge 1 commit intonvim-telescope:masterfrom
P4Cu wants to merge 1 commit intonvim-telescope:masterfrom
Conversation
This was referenced Feb 16, 2025
|
Any reason this PR can't be merged? I'm impacted by this for the same reason as OP in #3409. Thanks! |
Author
|
IMHO no reason. |
Author
|
@jamestrew Could you merge? |
29d9d52 to
5b261c1
Compare
Contributor
|
It couldn't be merged since It also requires more testing to make sure it doesn't break other valid use cases. (So far people have only complained that this isn't merged but not confirmed that they have successfully tested the fix.) |
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
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.
Description
:lua require("telescope.builtin").git_status { use_file_path = true }fails when called from worktree.This happens because we're looking for
.gitdirectory while for worktrees it's a.gitfile.I propose a better solution which use
git rev-parse --show-toplevelthat will work regardless of git internals (similar approach already used in another part of code).Fixes #3409
Type of change
Please delete options that are not relevant.
How Has This Been Tested?
See #3409 for minimal config that reproduces the issue.
I've tested it on non-worktree/worktree/non-git my full config.
Configuration:
Checklist: