Skip to content
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.

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

Fix error when trying to open diff view from split view on (Un)staged changes line #836

Merged
merged 1 commit into from
May 31, 2018

Conversation

koutcher
Copy link
Collaborator

The problem occurs when you have staged or unstaged changes in the repository and is mostly visible when diff-highlight is true. If you press d or enter in the main view it will automatically switch to stage view while if you press d from the split view it opens diff view and you get an annoying "Failed run the diff-highlight program: diff-highlight". For consistency, switch to stage view as it is done for the main view when there is no commit associated to the selected line.

@jonas jonas merged commit a7eb2a3 into jonas:master May 31, 2018
@jonas
Copy link
Owner

jonas commented May 31, 2018

Thanks for fixing another usability issue Thomas. I've seen this but never got annoyed enough to investigate it further.

jonas added a commit that referenced this pull request May 31, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants