X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=t%2Ft4018-diff-funcname.sh;h=be541348c6f8d469428e2fcc7abaf6d25168c08f;hb=9b3b7fd8072783e2ec20b3cf622713d39b1c8af4;hp=520e095c597a61f0f263a274a53ae0aa2781da85;hpb=5e22e21769454857e00bc55be1f2eef8d873ba72;p=git.git diff --git a/t/t4018-diff-funcname.sh b/t/t4018-diff-funcname.sh index 520e095c5..be541348c 100755 --- 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 html java pascal php python 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" ' @@ -65,7 +65,14 @@ test_expect_success 'custom pattern' ' test_expect_success 'last regexp must not be negated' ' git config diff.java.funcname "!static" && - test_must_fail git diff --no-index Beer.java Beer-correct.java + git diff --no-index Beer.java Beer-correct.java 2>&1 | + grep "fatal: Last expression must not be negated:" +' + +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" ' test_expect_success 'alternation in pattern' '