diff options
| author | Junio C Hamano <gitster@pobox.com> | 2012-01-10 22:14:26 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-01-10 22:14:26 (GMT) |
| commit | 6c65b5ea439165512d128e18829b67688ddab9cc (patch) | |
| tree | 610724b9cf742ca3a0745f16a9d3fa6f30f92a46 /t | |
| parent | 8769e93327f5efc26d179d794a67a5b993cd3693 (diff) | |
| parent | f14f9803ef13e972371e3f4bce69bca13dd1cd2d (diff) | |
| download | git-6c65b5ea439165512d128e18829b67688ddab9cc.zip git-6c65b5ea439165512d128e18829b67688ddab9cc.tar.gz git-6c65b5ea439165512d128e18829b67688ddab9cc.tar.bz2 | |
Merge the attributes fix in from maint-1.6.6 branch
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't')
| -rwxr-xr-x | t/t0003-attributes.sh | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/t/t0003-attributes.sh b/t/t0003-attributes.sh index 6946c4b..19265c7 100755 --- a/t/t0003-attributes.sh +++ b/t/t0003-attributes.sh @@ -172,6 +172,16 @@ test_expect_success 'relative paths' ' ' +test_expect_success 'prefixes are not confused with leading directories' ' + attr_check a_plus/g unspecified && + cat >expect <<-\EOF && + a/g: test: a/g + a_plus/g: test: unspecified + EOF + git check-attr test a/g a_plus/g >actual && + test_cmp expect actual +' + test_expect_success 'core.attributesfile' ' attr_check global unspecified && git config core.attributesfile "$HOME/global-gitattributes" && |