git@vger.kernel.org mailing list mirror (one of many)
 help / color / mirror / code / Atom feed
* BUG REPORT: gitk displays diffs with angle brackets incorrectly
@ 2015-08-19 19:57 Yojem Mejoy
  0 siblings, 0 replies; only message in thread
From: Yojem Mejoy @ 2015-08-19 19:57 UTC (permalink / raw)
  To: git

Summary: Certain diffs containing angle brackets ('<' or '>' characters) are displayed incorrectly in gitk's "markup words" and "color words" modes. The bug is caused by a feature that isn't aware of the formatting difference for the word diff modes.

How to reproduce the bug:
 
Create a file with the following, and commit:
x < 1
y > 2
 
Modify it to this, and commit:
z < 1
w > 2
 
Then view the results with:
gitk --color-words
 
You will see:
 * "Diff" shows bogus removal on 1st line and bogus addition on 2nd line.
 * "Old version" cuts off at right angle bracket.
 * "New Version" cuts off at left angle bracket.

I personally use a 2-line patch to fix this by disabling/breaking the feature that does string comparisons for "  >" and "  <", but I know that's not the correct fix, so I'm not including it in this post.

^ permalink raw reply	[flat|nested] only message in thread

only message in thread, other threads:[~2015-08-19 19:57 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2015-08-19 19:57 BUG REPORT: gitk displays diffs with angle brackets incorrectly Yojem Mejoy

Code repositories for project(s) associated with this public inbox

	https://80x24.org/mirrors/git.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).