Merge 'kn/for-each-tag-branch' into kn/for-each-tag

diff --git a/t/t4018-diff-funcname.sh b/t/t4018-diff-funcname.sh
index 34591c23da82230f2412b46620f0d3a12188656f..67373dc44ef18ae4c58f237ed9f5c7610ec6413c 100755 (executable)
--- a/t/t4018-diff-funcname.sh
+++ b/t/t4018-diff-funcname.sh
@@ -31,6 +31,7 @@ diffpatterns="
        cpp
        csharp
        fortran
+       fountain
        html
        java
        matlab
@@ -52,15 +53,15 @@ do
                echo "*.java diff=$p" >.gitattributes &&
                test_expect_code 1 git diff --no-index \
                        A.java B.java 2>msg &&
-               ! test_i18ngrep fatal msg &&
-               ! test_i18ngrep error msg
+               test_i18ngrep ! fatal msg &&
+               test_i18ngrep ! error msg
        '
        test_expect_success "builtin $p wordRegex pattern compiles" '
                echo "*.java diff=$p" >.gitattributes &&
                test_expect_code 1 git diff --no-index --word-diff \
                        A.java B.java 2>msg &&
-               ! test_i18ngrep fatal msg &&
-               ! test_i18ngrep error msg
+               test_i18ngrep ! fatal msg &&
+               test_i18ngrep ! error msg
        '
 done