From: Junio C Hamano Date: Tue, 10 Jan 2012 22:24:01 +0000 (-0800) Subject: Merge the attributes fix in from maint-1.6.7 branch X-Git-Tag: v1.7.9-rc1~3^2~3 X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=55dcc2ebad1b3ed4a6912f6f401f63cd3c71026f;p=git.git Merge the attributes fix in from maint-1.6.7 branch Signed-off-by: Junio C Hamano --- 55dcc2ebad1b3ed4a6912f6f401f63cd3c71026f diff --cc t/t0003-attributes.sh index dbb2623d9,19265c77c..51f3045ba --- a/t/t0003-attributes.sh +++ b/t/t0003-attributes.sh @@@ -157,8 -169,19 +157,18 @@@ test_expect_success 'relative paths' (cd b && attr_check ../a/f f) && (cd b && attr_check ../a/g a/g) && (cd b && attr_check ../a/b/g a/b/g) - ' + 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" &&