More revert dirty-set rules to sync with git#11076
Merged
Merged
Conversation
Two fixes on top of the prior table-level granularity change: 1. Match git's index-clean requirement: refuse on any staged change regardless of which tables the revert touches. git refuses "your local changes would be overwritten by revert" even when the staged file is unrelated, because the resulting commit would mix staged work with the revert's inverse-change commit. 2. Filter TableUnmodified entries out of stageRevertedTables. Without this, a working-set table that the merge "took ours" for would be staged and silently committed alongside the revert. The new disjoint test caught this once dolt_status was exercised. Add a test for the staged-disjoint case that should refuse.
Contributor
|
@macneale4 DOLT
|
Contributor
|
@macneale4 DOLT
|
Contributor
|
@macneale4 DOLT
|
|
@coffeegoddd DOLT
|
|
@coffeegoddd DOLT
|
|
@coffeegoddd DOLT
|
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.
Git will reject
revertwhen there is anything staged, regardless of conflicts or not in the changed. This change makes dolt follow the same pattern.Related: #11073