Repository navigation
fix: preserve empty stack bases when absorbing primary work - #176
Merged
Merged
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
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.
A dirty-primary refusal could recommend capturing
HEADeven when the work existed only as uncommitted file changes. Name a path-scopedstack absorbcommand with-N -mand the selected manifest instead. Keep capture-integration guidance for existing undeclared integration commits, and avoid assigning a patch to an arbitrary stack. Diagnostic Git reads preserve the primary index.Refuse default amend on an empty stack before recovery or materialization. A first-commit absorb also refuses if an existing branch is symbolic or has moved away from the declared base, preserving undeclared history. If the local branch is absent, create it explicitly at the pinned base before applying the patch.
Validation: regression fixtures execute the printed remedy, prove that the first stack commit is a child of the original base, and check preservation on refusal. Existing absorb, guard, integration-diagnostic, module-boundary and documentation checks also pass. The concurrent manifest-writer fixture synchronizes on actual lock contention so that its competing commit cannot race the initial index preflight. Version 0.47.18; independent review and 20/20 CI are required before merge.