fix: preserve aliased manifest diff semantics#177
Merged
junior-ricon merged 1 commit intoJul 26, 2026
Merged
Conversation
This was referenced Jul 26, 2026
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
2 participants
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.
Finding
The changed-ID derivation collapses each manifest to one path per ID. A manifest can contain repeated IDs after a merge-produced alias, so removing one alias while retaining another produces no candidate ID and an empty readable patch. Multiple IDs can also target the same readable path; selecting only the changed ID can then materialize content that the full readable tree would overwrite with an unchanged ID.
This fix seeds selection from exact changed manifest rows, then expands through the affected ID/path component across both refs. The changed-note artifacts therefore preserve full-tree diff semantics without returning to per-note Git processes.
Validation
mise run test test/diff.bats— 14/14 passedbash -n lib/diff.sh .mise/tasks/diffreadme build --checkgit diff --checkFixes the review finding on #176.