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 diff highlighting of removed lines starting with -- and added lines starting with ++ #877

Merged
merged 5 commits into from
Jan 11, 2019

Conversation

koutcher
Copy link
Collaborator

@koutcher koutcher commented Nov 17, 2018

When working with Ada source code (where comments start with --), the diff highlighting is messed up whenever a comment starting at the beginning of the line is removed because tig takes it either for the DEL_FILE or the START prefix.

It should close #875 and #871.

Added more changes closing #804, #762 and #866.

@koutcher koutcher force-pushed the master branch 2 times, most recently from fb6db90 to b2dc966 Compare December 2, 2018 20:26
@koutcher koutcher force-pushed the master branch 4 times, most recently from 560c6b6 to 93999bb Compare December 14, 2018 16:35
@koutcher koutcher force-pushed the master branch 2 times, most recently from 5360ddf to 8403231 Compare January 3, 2019 10:46
@jonas
Copy link
Owner

jonas commented Jan 11, 2019

Wow, thanks a lot Thomas!

@jonas jonas merged commit 93ea970 into jonas:master Jan 11, 2019
@odnoletkov
Copy link
Contributor

There is status.showUntrackedFiles Git config option (and corresponding command line options) allowing to override default behavior and say don't show untracked files at all. It is useful for some repositories and some use-cases (like partially tracking home directory). Instead of having a separate option in tig can we read if from the Git configuration to avoid having to duplicate this configuration?

@jonas
Copy link
Owner

jonas commented Jan 11, 2019

Yes, that's a good idea. Let's do that. Do you want to do a follow-up or should I do it?

@jonas
Copy link
Owner

jonas commented Jan 11, 2019

Actually, I will have to read the documentation for the option. Currently, Tig shows untracked files by default in the main view. Not sure if it is confusing to have a "status.*" Git option apply to Tig's main view

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.

tig diff messed up if a line starting with --foo is removed in diff
3 participants