Merge branch 'ap/maint-update-index-h-is-for-help' into maint-1.8.1

diff --git a/t/t0003-attributes.sh b/t/t0003-attributes.sh
index 807b8b88e215df5ce39504b1858be8694499727d..1035a14b37203202a5476f65d07f9bc505bfb52c 100755 (executable)
--- a/t/t0003-attributes.sh
+++ b/t/t0003-attributes.sh
@@ -198,7 +198,8 @@ test_expect_success 'root subdir attribute test' '
 
 test_expect_success 'negative patterns' '
        echo "!f test=bar" >.gitattributes &&
-       test_must_fail git check-attr test -- f
+       git check-attr test -- '"'"'!f'"'"' 2>errors &&
+       test_i18ngrep "Negative patterns are ignored" errors
 '
 
 test_expect_success 'patterns starting with exclamation' '