fix(vcs): use merge-base semantics for range-to-working-tree diffs - #181
Open
athal7 wants to merge 1 commit into
Open
fix(vcs): use merge-base semantics for range-to-working-tree diffs#181athal7 wants to merge 1 commit into
athal7 wants to merge 1 commit into
Conversation
`<from>..-` was diffing `from` directly against HEAD (two-dot) before unioning with working-tree changes, instead of using merge-base (three-dot) semantics like `<from>...<to>` does. This meant commits made on `from` after it diverged from HEAD incorrectly showed up as part of the diff. Fixes both the `lumen explain` path (src/main.rs, get_range_diff now passes three_dot=true) and the `lumen diff` TUI path (DiffRefs::from_options, which now computes merge-base before storing `from`, mirroring the existing TripleDots arm). Co-Authored-By: anthropic/claude-sonnet-5 <noreply@opencode.ai>
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.
<from>..-diffsfromdirectly against HEAD (two-dot) before unioningwith working-tree changes, instead of using merge-base (three-dot)
semantics like
<from>...<to>does. This means commits made onfromafter it diverged from HEAD incorrectly show up in the diff.
Fixes both the
lumen explainpath (src/main.rs) and thelumen diffTUI path (DiffRefs::from_options), mirroring the merge-base handling
already used by the
TripleDotsarm in each. Adds regression testscovering diverging branches in both src/vcs/git.rs and
src/command/diff/git.rs.