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

Make work with git diffn --word-diff #11

Open
ElectricRCAircraftGuy opened this issue Nov 28, 2020 · 2 comments
Open

Make work with git diffn --word-diff #11

ElectricRCAircraftGuy opened this issue Nov 28, 2020 · 2 comments
Labels
bug Something isn't working

Comments

@ElectricRCAircraftGuy
Copy link
Owner

ElectricRCAircraftGuy commented Nov 28, 2020

Bug: --word-diff doesn't work. I'm seeing a lot of this in the output when I do git diffn --word-diff:

============== GIT DIFFN ERROR ==============
THIS CODE SHOULD NEVER BE REACHED! If you see this, open up an issue for `git diffn`
  here: https://github.com/ElectricRCAircraftGuy/eRCaGuy_dotfiles/issues
  It may be because you have some custom `git config` color or text formatting settings
  or something, which perhaps I am failing to handle correctly.
@ElectricRCAircraftGuy ElectricRCAircraftGuy added the bug Something isn't working label Nov 28, 2020
@ElectricRCAircraftGuy
Copy link
Owner Author

ElectricRCAircraftGuy commented Nov 28, 2020

Note: what I'd reeeeaaaally like to see this work with the most, however, is the character-by-character diff highlighting, like this:

git diff --word-diff-regex=.  # good
# And:
git diff --color-words=.      # best

See this answer, and the comment under it: https://stackoverflow.com/questions/3231759/how-can-i-visualize-per-character-differences-in-a-unified-diff-file/7870727#7870727.

@ap6us
Copy link

ap6us commented Aug 8, 2021

Am seeing this issue too.

Raw line: 
=============================================
   36,  36:    //For generator: Cq_ContentToWordsMap_applyAsWord;
   37,  37:    [-private-]{+public+} static final Path sourcePath = Cq_ContentToWordsMap_applyAsWord.OUTPUT_PATH;
   38,  38:    [-private-]{+public+} static final List<String> output = Cq_ContentToWordsMap_applyAsWord.generate();
   39,  39:    [-private-]{+public+} static final String OUTPUT_FORMAT = "    output.add(\"%s\");";
============== GIT DIFFN ERROR ==============
THIS CODE SHOULD NEVER BE REACHED! If you see this, open up an issue for `git diffn`
  here: https://github.com/ElectricRCAircraftGuy/eRCaGuy_dotfiles/issues
  It may be because you have some custom `git config` color or text formatting settings
  or something, which perhaps I am failing to handle correctly.
Raw line: 
=============================================
============== GIT DIFFN ERROR ==============
THIS CODE SHOULD NEVER BE REACHED! If you see this, open up an issue for `git diffn`
  here: https://github.com/ElectricRCAircraftGuy/eRCaGuy_dotfiles/issues
  It may be because you have some custom `git config` color or text formatting settings
  or something, which perhaps I am failing to handle correctly.
Raw line: 
=============================================
   40,  40:    // could add counter to show where it appeared in source

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bug Something isn't working
Projects
None yet
Development

No branches or pull requests

2 participants