eRCaGuy_dotfiles icon indicating copy to clipboard operation
eRCaGuy_dotfiles copied to clipboard

Make work with `git diffn --word-diff`

Open ElectricRCAircraftGuy opened this issue 4 years ago • 2 comments

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 avatar Nov 28 '20 19:11 ElectricRCAircraftGuy

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.

ElectricRCAircraftGuy avatar Nov 28 '20 21:11 ElectricRCAircraftGuy

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

ap6us avatar Aug 08 '21 13:08 ap6us