I've been getting a couple of test failures and finally had the time to track them down.
t4034-diff-words fails tests "22 diff driver 'bibtex'" and "26 diff driver 'html'". Bisecting shows that the file started giving me errors in commit 8d96e72 "t4034: bulk verify builtin word regex sanity", which appears to introduce those tests. I don't see anything obviously wrong with the tests and I'm not familiar with the diff-words code, so I'm not sure what's wrong.
I am running on OS X 10.8, with Xcode 4.4.1 (llvm-gcc 4.2.1).
Test results follow:
---------- 8< ----------
expecting success:
cp "$TEST_DIRECTORY/t4034/bibtex/pre" \
"$TEST_DIRECTORY/t4034/bibtex/post" \
"$TEST_DIRECTORY/t4034/bibtex/expect" . &&
echo "* diff=bibtex" >.gitattributes &&
word_diff --color-words
--- expect 2012-08-18 05:54:29.000000000 +0000
+++ output.decrypted 2012-08-18 05:54:29.000000000 +0000
@@ -8,8 +8,8 @@
author={Aldous, <RED>D.<RESET><GREEN>David<RESET>},
journal={Information Theory, IEEE Transactions on},<RESET>
volume={<RED>33<RESET><GREEN>Bogus.<RESET>},
- number={<RED>2<RESET><GREEN>4<RESET>},
+ number={4},
pages={219--223},<RESET>
- year=<GREEN>1987,<RESET>
-<GREEN> note={This is in fact a rather funny read since ethernet works well in practice. The<RESET> {<RED>1987<RESET><GREEN>\em pre} reference is the right one, however.<RESET>}<RED>,<RESET>
+ year=<RED>{1987},<RESET><GREEN>1987,<RESET>
+ note={This is in fact a rather funny read since ethernet works well in practice. The {\em pre} reference is the right one, however.}
}<RESET>
not ok - 22 diff driver 'bibtex'
---------- 8< ----------
expecting success:
cp "$TEST_DIRECTORY/t4034/html/pre" \
"$TEST_DIRECTORY/t4034/html/post" \
"$TEST_DIRECTORY/t4034/html/expect" . &&
echo "* diff=html" >.gitattributes &&
word_diff --color-words
--- expect 2012-08-18 05:54:29.000000000 +0000
+++ output.decrypted 2012-08-18 05:54:29.000000000 +0000
@@ -4,5 +4,5 @@
<BOLD>+++ b/post<RESET>
<CYAN>@@ -1,3 +1,3 @@<RESET>
<tag <GREEN>newattr="newvalue"<RESET>><GREEN>added<RESET> content</tag>
-<tag attr=<RED>"value"<RESET><GREEN>"newvalue"<RESET>><RED>content<RESET><GREEN>changed<RESET></tag>
-<<RED>tag<RESET><GREEN>newtag<RESET>>content <RED>&entity;<RESET><GREEN>&newentity;<RESET><<RED>/tag<RESET><GREEN>/newtag<RESET>>
+<tag attr="newvalue">changed</tag>
+<newtag>content &newentity;</newtag>
not ok - 26 diff driver 'html'--
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