Skip to content

fix: Handle rev ranges that resolve to LOCAL..{REV} #436

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Nov 20, 2023
Merged

fix: Handle rev ranges that resolve to LOCAL..{REV} #436

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f083ff8
Compare left-hand-side local files to right-hand-side commit
refractalize Nov 8, 2023
1a75e8d
Better handling of LOCAL rev types
sindrets Nov 20, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions lua/diffview/vcs/adapters/git/init.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1487,6 +1487,8 @@ function GitAdapter:rev_to_args(left, right)
return {}
elseif left.type == RevType.COMMIT and right.type == RevType.STAGE then
return { "--cached", left.commit }
elseif left.type == RevType.LOCAL and right.type == RevType.COMMIT then
return { ".." .. right.commit }
else
return { left.commit }
end
Expand Down