Merge branch 'po/etc-gitattributes'

diff --git a/t/t4018-diff-funcname.sh b/t/t4018-diff-funcname.sh
index 61de8a2718df8a7b0b0661d7ba47ade133d66ab8..c8e19372b00f128646b809e1f5723d88b58a3f30 100755 (executable)
--- a/t/t4018-diff-funcname.sh
+++ b/t/t4018-diff-funcname.sh
@@ -37,8 +37,13 @@ for p in $builtin_patterns
 do
        test_expect_success "builtin $p pattern compiles" '
                echo "*.java diff=$p" > .gitattributes &&
-               ! ( git diff --no-index Beer.java Beer-correct.java 2>&1 |
-                       grep "fatal" > /dev/null )
+               ! { git diff --no-index Beer.java Beer-correct.java 2>&1 |
+                       grep "fatal" > /dev/null; }
+       '
+       test_expect_success "builtin $p wordRegex pattern compiles" '
+               ! { git diff --no-index --word-diff \
+                       Beer.java Beer-correct.java 2>&1 |
+                       grep "fatal" > /dev/null; }
        '
 done