From: Thomas Rast <trast@student.ethz.ch>
To: Scott Johnson <scottj75074@yahoo.com>
Cc: Michael J Gruber <git@drmicha.warpmail.net>,
Matthijs Kooijman <matthijs@stdin.nl>, <git@vger.kernel.org>
Subject: Re: [PATCH 0/4] --word-regex sanity checking and such
Date: Wed, 15 Dec 2010 20:51:14 +0100 [thread overview]
Message-ID: <201012152051.15159.trast@student.ethz.ch> (raw)
In-Reply-To: <913156.57703.qm@web110711.mail.gq1.yahoo.com>
Scott Johnson wrote:
> I've attached a pre and post with the complete file that is showing this
> problem. I hope you'll be able to reproduce the issue with this.
I can't reproduce. I did this:
$ ls -l
total 16
-rw-r--r-- 1 thomas users 2128 2010-12-15 20:42 post.html
-rw-r--r-- 1 thomas users 2354 2010-12-15 20:42 pre.html
$ echo '*.html diff=html' >.gitattributes
$ git diff --no-index pre.html post.html
diff --git 1/pre.html 2/post.html
[...]
- <li class="ydn-patterns"><em></em><a href="#">ydn-patterns</a></li>
- <li class="ydn-mail"><em></em><a href="#">ydn-mail</a></li>
- <li class="yws-maps"><em></em><a href="#">yws-maps</a></li>
- <li class="ydn-delicious"><em></em><a href="#">ydn-delicious</a></li>
- <li class="yws-flickr"><em></em><a href="#">yws-flickr</a></li>
- <li class="yws-events"><em></em><a href="#">yws-events</a></li>
+ <li><em></em><a href="#">ydn-patterns</a></li>
+ <li><em></em><a href="#">ydn-mail</a></li>
+ <li><em></em><a href="#">yws-maps</a></li>
+ <li><em></em><a href="#">ydn-delicious</a></li>
+ <li><em></em><a href="#">yws-flickr</a></li>
+ <li><em></em><a href="#">yws-events</a></li>
</ul>
</div><!-- wrap -->
</div><!-- folder_list -->
$ git diff --word-diff --no-index pre.html post.html
diff --git 1/pre.html 2/post.html
[...]
<li[-class="ydn-patterns"-]><em></em><a href="#">ydn-patterns</a></li>
<li[-class="ydn-mail"-]><em></em><a href="#">ydn-mail</a></li>
<li[-class="yws-maps"-]><em></em><a href="#">yws-maps</a></li>
<li[-class="ydn-delicious"-]><em></em><a href="#">ydn-delicious</a></li>
<li[-class="yws-flickr"-]><em></em><a href="#">yws-flickr</a></li>
<li[-class="yws-events"-]><em></em><a href="#">yws-events</a></li>
</ul>
</div><!-- wrap -->
</div><!-- folder_list -->
That's running bleeding-edge git, like I always do, but the userdiff
stuff hasn't changed in ages.
What does
git config diff.html.wordregex
say on your system?
--
Thomas Rast
trast@{inf,student}.ethz.ch
next prev parent reply other threads:[~2010-12-15 19:51 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-12-15 3:47 html userdiff is not showing all my changes Scott Johnson
2010-12-15 9:06 ` Michael J Gruber
2010-12-15 9:12 ` Matthijs Kooijman
2010-12-15 9:29 ` Michael J Gruber
2010-12-15 15:13 ` [PATCH 0/4] --word-regex sanity checking and such Thomas Rast
2010-12-15 15:13 ` [PATCH 1/4] diff.c: pass struct diff_words into find_word_boundaries Thomas Rast
2010-12-15 15:13 ` [PATCH 2/4] diff.c: implement a sanity check for word regexes Thomas Rast
2010-12-15 15:13 ` [PATCH 3/4] userdiff: fix typo in ruby word regex Thomas Rast
2010-12-15 15:13 ` [PATCH 4/4] t4034: bulk verify builtin word regex sanity Thomas Rast
[not found] ` <913156.57703.qm@web110711.mail.gq1.yahoo.com>
2010-12-15 19:51 ` Thomas Rast [this message]
2010-12-15 20:48 ` [PATCH 0/4] --word-regex sanity checking and such Scott Johnson
2010-12-18 16:17 ` [PATCH v2 " Thomas Rast
2010-12-18 16:17 ` [PATCH v2 1/4] diff.c: pass struct diff_words into find_word_boundaries Thomas Rast
2010-12-18 16:17 ` [PATCH v2 2/4] diff.c: implement a sanity check for word regexes Thomas Rast
2010-12-18 21:00 ` Junio C Hamano
2010-12-19 1:59 ` Thomas Rast
2010-12-18 16:17 ` [PATCH v2 3/4] userdiff: fix typo in ruby and python " Thomas Rast
2010-12-18 21:02 ` Junio C Hamano
2010-12-19 2:10 ` Thomas Rast
2010-12-18 16:17 ` [PATCH v2 4/4] t4034: bulk verify builtin word regex sanity Thomas Rast
2011-01-11 21:47 ` [RFC/PATCH 0/3] " Jonathan Nieder
2011-01-11 21:48 ` [PATCH 1/3] " Jonathan Nieder
2011-01-18 18:00 ` Re*: " Junio C Hamano
2011-01-11 21:48 ` [PATCH 2/3] userdiff: simplify word-diff safeguard Jonathan Nieder
2011-01-11 21:49 ` [PATCH 3/3] t4034 (diff --word-diff): style suggestions Jonathan Nieder
2010-12-18 16:24 ` [PATCH v2 0/4] --word-regex sanity checking and such Thomas Rast
2010-12-18 20:48 ` Junio C Hamano
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=201012152051.15159.trast@student.ethz.ch \
--to=trast@student.ethz.ch \
--cc=git@drmicha.warpmail.net \
--cc=git@vger.kernel.org \
--cc=matthijs@stdin.nl \
--cc=scottj75074@yahoo.com \
/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).