Merge branch 'maint-1.5.4' into maint

diff --git a/t/t0003-attributes.sh b/t/t0003-attributes.sh
index 3faf135e38ccbe71241679da464d7cf709ae73d7..c56d2fbabaa0fdd90547ce8b629a629c21fbbc0e 100755 (executable)
--- a/t/t0003-attributes.sh
+++ b/t/t0003-attributes.sh
@@ -21,6 +21,7 @@ test_expect_success 'setup' '
        mkdir -p a/b/d a/c &&
        (
                echo "f test=f"
+               echo "a/i test=a/i"
        ) >.gitattributes &&
        (
                echo "g test=a/g" &&
@@ -46,4 +47,11 @@ test_expect_success 'attribute test' '
 
 '
 
+test_expect_success 'root subdir attribute test' '
+
+       attr_check a/i a/i &&
+       attr_check subdir/a/i unspecified
+
+'
+
 test_done