From: "Yojem Mejoy" <yojem@gmx.com>
To: git@vger.kernel.org
Subject: BUG REPORT: gitk displays diffs with angle brackets incorrectly
Date: Wed, 19 Aug 2015 21:57:02 +0200 [thread overview]
Message-ID: <trinity-67046fdf-65d7-4ab9-a391-709a73002fee-1440014221975@3capp-mailcom-bs12> (raw)
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.
reply other threads:[~2015-08-19 19:57 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=trinity-67046fdf-65d7-4ab9-a391-709a73002fee-1440014221975@3capp-mailcom-bs12 \
--to=yojem@gmx.com \
--cc=git@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).