summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2008-09-22 20:01:33 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2008-09-22 20:01:33 -0700
commit4be4680cbb37cd803fa018c736879d936cd45671 (patch)
tree5d5019f257598b719c0b94907b9722a97a92cd12
parentMerge branch 'bc/maint-diff-hunk-header-fix' into bc/master-diff-hunk-header-fix (diff)
parentt4018-diff-funcname: test syntax of builtin xfuncname patterns (diff)
downloadtgif-4be4680cbb37cd803fa018c736879d936cd45671.tar.xz
Merge branch 'bc/maint-diff-hunk-header-fix' into bc/master-diff-hunk-header-fix
* bc/maint-diff-hunk-header-fix: t4018-diff-funcname: test syntax of builtin xfuncname patterns
-rwxr-xr-xt/t4018-diff-funcname.sh11
1 files changed, 11 insertions, 0 deletions
diff --git a/t/t4018-diff-funcname.sh b/t/t4018-diff-funcname.sh
index 602d68f092..99fff973eb 100755
--- a/t/t4018-diff-funcname.sh
+++ b/t/t4018-diff-funcname.sh
@@ -32,7 +32,18 @@ EOF
sed 's/beer\\/beer,\\/' < Beer.java > Beer-correct.java
+builtin_patterns="bibtex java pascal ruby tex"
+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 )
+ '
+done
+
test_expect_success 'default behaviour' '
+ rm -f .gitattributes &&
git diff --no-index Beer.java Beer-correct.java |
grep "^@@.*@@ public class Beer"
'