fix(git): correct typo rev_names -> ref_names in merge context - #62
Merged
Conversation
There was a problem hiding this comment.
Pull request overview
Fixes a merge-context display bug in the Git adapter where the theirs side used the wrong field name (rev_names), preventing the ref name from being shown (e.g., in winbar rendering that expects ref_names).
Changes:
- Rename
ret.theirs.rev_namestoret.theirs.ref_namesinGitAdapter:get_merge_context()to match the expectedvcs.MergeContextshape.
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
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.
The
theirsentry inget_merge_contextusedrev_namesinstead ofref_names, so the ref name was never displayed in the winbar. (This bug has been present on the original sindrets repro since 168c8fc.)