Merge branch 'lh/submodule-tree-traversal' (early part)

[git.git] / t / t4018-diff-funcname.sh

diff --git a/t/t4018-diff-funcname.sh b/t/t4018-diff-funcname.sh
index 40a805a8661d9a8bcd4802c88d33e8106034a452..be541348c6f8d469428e2fcc7abaf6d25168c08f 100755 (executable)
--- a/t/t4018-diff-funcname.sh
+++ b/t/t4018-diff-funcname.sh
@@ -32,7 +32,7 @@ EOF
 
 sed 's/beer\\/beer,\\/' < Beer.java > Beer-correct.java
 
-builtin_patterns="bibtex java pascal ruby tex"
+builtin_patterns="bibtex html java objc pascal php python ruby tex"
 for p in $builtin_patterns
 do
        test_expect_success "builtin $p pattern compiles" '
@@ -69,7 +69,7 @@ test_expect_success 'last regexp must not be negated' '
        grep "fatal: Last expression must not be negated:"
 '
 
-test_expect_failure 'pattern which matches to end of line' '
+test_expect_success 'pattern which matches to end of line' '
        git config diff.java.funcname "Beer$" &&
        git diff --no-index Beer.java Beer-correct.java |
        grep "^@@.*@@ Beer"