Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.kernel.org/pub/scm/git/git.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2012-01-11 02:14:26 +0400
committerJunio C Hamano <gitster@pobox.com>2012-01-11 02:14:26 +0400
commit6c65b5ea439165512d128e18829b67688ddab9cc (patch)
tree610724b9cf742ca3a0745f16a9d3fa6f30f92a46 /t/t0003-attributes.sh
parent8769e93327f5efc26d179d794a67a5b993cd3693 (diff)
parentf14f9803ef13e972371e3f4bce69bca13dd1cd2d (diff)
Merge the attributes fix in from maint-1.6.6 branch
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t0003-attributes.sh')
-rwxr-xr-xt/t0003-attributes.sh10
1 files changed, 10 insertions, 0 deletions
diff --git a/t/t0003-attributes.sh b/t/t0003-attributes.sh
index 6946c4b82f..19265c77cf 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" &&