fix: resolve --file paths from repository subdirectories#2926
Open
leno23 wants to merge 1 commit into
Open
Conversation
Strip the repository workdir instead of the git directory when converting --file to a repo-relative path so launching gitui from a subdirectory selects the intended file in the Files tab. Fixes gitui-org#2871 Co-authored-by: Cursor <cursoragent@cursor.com>
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
1 participant
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.
Summary
--file/-fwhen gitui is launched from a subdirectory of the repository (e.g.cd frontend && gitui --file src/index.html)..git), which breaks in linked worktrees and non-root cwd; it now resolves against the repository workdir and the current working directory.Test plan
cargo test resolve_select_file(unit tests for cwd in repo root and in a subdirectory)gitui --file frontend/src/index.htmlfrom repo rootcd frontend && gitui --file src/index.htmlFixes #2871
Made with Cursor