Repository navigation
fix(repo): refuse an untracked file where a result adds an out-of-view path #251
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
Merged
Merged
Changes from all commits
Commits
Show all changes
7 commits
Select commit
Hold shift + click to select a range
788fa94
fix(repo): refuse an untracked file where a result adds an out-of-vie…
tonibergholm-codento d568a3f
fix(repo): guard leaving a private branch too; review fixes (#248)
tonibergholm-codento aab9ba8
docs(adr): note the partial-clone limit of the out-of-view guard (#248)
tonibergholm-codento 477bc99
Merge origin/main into fix/248-untracked-outofview
tonibergholm-codento 084999d
fix(repo): note why the partial-clone limit stays; comment the blocke…
tonibergholm-codento 883a85a
fix(repo): let a private abort and case-only renames pass the out-of-…
tonibergholm-codento 184bd9f
fix(repo): limit the out-of-view case-alias exception to laid-out pat…
tonibergholm-codento File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
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
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
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
Oops, something went wrong.
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
On a partial clone whose sparse view excludes a subtree, that subtree is commonly absent from the local store, so
tree_file_entries_with_perms_sparse_presentsilently skips every target path beneath it. If a merge, pick, rebase, switch, or undo carries a changed absent subtree containing a newly added path and an untracked file already exists at that path, this guard sees neither the addition nor the collision: a clean operation can move the ref and a conflicted operation can write its in-view stop state instead of refusing up front. A later commit may only fail withGappedPathContent, after the operation has already changed visible state, so the guard needs to compare absent carried subtree entries or conservatively check on-disk paths beneath changed missing subtrees.Useful? React with 👍 / 👎.