Merge branch 'rs/daemon-fixes' into maint

diff --git a/t/t4018-diff-funcname.sh b/t/t4018-diff-funcname.sh
index 34591c23da82230f2412b46620f0d3a12188656f..1dbaa3864a568e09c30c174f771d593beeb1284d 100755 (executable)
--- a/t/t4018-diff-funcname.sh
+++ b/t/t4018-diff-funcname.sh
@@ -52,15 +52,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