fix: restore rejected staged note entries - #199
Merged
junior-ricon merged 1 commit intoJul 30, 2026
Merged
Conversation
junior-ricon
merged commit Jul 30, 2026
39fbae5
into
junior/onboard-existing-plaintext
2 checks passed
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.
Summary
Why
PR #197 verifies tracked-note ciphertext only after
git add --renormalize. When that check rejected a plaintext-producing filter, the failed command left the plaintext replacement staged. A subsequent ordinary commit could auto-obfuscate and commit that changed plaintext under an opaque ID because the staged attributes no longer selected Git Crypt.This focused fix makes the failed stage operation restore the entry it replaced.
Validation
mise run test stage: 29/29 passedgit diff --checkFix-it for #197. Targets
junior/onboard-existing-plaintext; does not merge or release.