fix(checkpoints): detect nested repos via .git/HEAD and .git pointer files #11341
+208
−44
Conversation
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
…files - Remove --follow flag to prevent symlink traversal outside workspace - Add **/.git glob to detect submodule/worktree .git pointer files - Validate .git files contain gitdir: prefix before treating as repo marker - Use path.basename/path.dirname for classification instead of string matching - Use path.resolve for root exclusion (handles absolute/relative paths) - Add 6 new test cases covering submodule detection, stray .git files, root exclusion, --follow removal, and unreadable file handling Closes RooCodeInc#11340
0xMink
requested review from
cte,
daniel-lxs,
hannesrudolph,
jr and
mrubens
as code owners
dosubot
bot
added
bug
Contributor
Author
|
Superseded by #11360, which subsumes the detection improvements from this PR and adds nested repo exclusion, post-staging safety enforcement, and i18n support. |
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.
Closes #11340
Summary
Fixes three correctness issues in
ShadowCheckpointService.getNestedGitRepository():**/.git/HEAD, missing submodule/worktree.gitpointer files (which containgitdir:).--followallowed ripgrep to traverse symlinks outside the workspace boundary.includes()/startsWith()heuristics withpath.basename()/path.dirname()andpath.resolve().Test plan
.git/HEADdirectory detection still works.gitfile triggers detection.gitfile withoutgitdir:prefix is ignored.git/HEADis excluded.gitmatch is excluded--followflag is not present in ripgrep args.gitfile is skipped gracefully