Apologies, re-sending the patch as an attachment instead, since Gmail decided to strip the tab characters
diff --git a/t/t6135-pathspec-with-attrs.sh b/t/t6135-pathspec-with-attrs.sh index 457cc167c7..7a7502a6eb 100755 --- a/t/t6135-pathspec-with-attrs.sh +++ b/t/t6135-pathspec-with-attrs.sh @@ -87,6 +87,23 @@ test_expect_success 'check specific set attr (2)' ' test_cmp expect actual ' +test_expect_success 'check specific set attr nested .gitattributes' ' + cat <<-\EOF >sub/.gitattributes && + fileSetLabel otherLabel + EOF + test_write_lines sub/fileSetLabel >expect && + git ls-files ":(attr:otherLabel)" >actual && + test_cmp expect actual && + + git ls-files ":(attr:otherLabel)sub" >actual && + test_cmp expect actual && + + git ls-files ":(attr:otherLabel)sub/" >actual && + test_must_be_empty actual && + + rm sub/.gitattributes +' + test_expect_success 'check specific unset attr' ' cat <<-\EOF >expect && fileUnsetLabel
