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
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html