Validate user refs and reset forced branch targets - #2000
Merged
Conversation
Reject branch and tag names that collide with ref syntax, commit hashes, or DoltLite's pseudo-refs through a shared validator. Make forced branch create and copy reset the destination working set, and honor forced rename by replacing the destination with the source branch and its working state. Co-Authored-By: OpenAI Codex <noreply@openai.com>
Contributor
DoltLite source coverage
Merged 163 pooled raw profiles from the distributed Linux correctness jobs. Per-file coverage (91 files)
|
Contributor
DoltLite performance vs PR base
blobpk details
compositepk details
int details
textpk details
vc details
All relative performance gates passed. |
|
SummaryCoverage spans branch and tag creation, copying, moving, renaming, resetting, deletion, and transaction handling, including persistence across reopening and visibility across connections. It also exercises edge cases and invalid or adversarial names, malformed operations, dirty working data, schema replacement, rollback behavior, and safe reference resolution, with the tested application behavior broadly healthy. Safe to merge — the only finding is a minor, non-regression validation-message defect unrelated to this PR; it does not create refs or alter existing data. The PR has no attributable failures, so the finding is a flag for later rather than a merge blocker. Tests run by Ito
Additional Findings DetailsThese findings are unrelated to the current changes but were observed during testing. ⚪ Branch dash name shows the wrong error
Evidence PackageTip Reply with @itoqa to send us feedback on this test run. |
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
-ffor branch rename, replacing the destination ref and carrying the source working set across the renameFailure before
DoltLite accepted ambiguous refs such as
HEAD,WORKING,bad..name, and empty tag names. A forced create or copy updated only the destination tip, leaving its previous dirty working set attached. Forced rename ignored-fand failed whenever the destination existed.The force bug was visible even when both branches pointed at the same commit: after dirtying
victim,dolt_branch('-f', 'victim', 'HEAD')returned success, but reopeningvictimstill exposed the dirty row and a nonemptydolt_status.Validation
test/vc_oracle_branch_test.sh: 45 passed, 0 failedtest/vc_oracle_tags_test.sh: 19 passed, 0 failedtest/run_doltlite_tests.sh build/doltlite: 99/99 suites; 310,162 regression assertionsmake lintgit diff --checkCo-Authored-By: OpenAI Codex noreply@openai.com