diff options
| author | Junio C Hamano <gitster@pobox.com> | 2012-01-10 22:24:01 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-01-10 22:24:01 (GMT) |
| commit | 55dcc2ebad1b3ed4a6912f6f401f63cd3c71026f (patch) | |
| tree | d24d751dfcb1181c72ea034f498d8fad5fd613ad /t/t0003-attributes.sh | |
| parent | 829a1c616967176ccd859c18a6e8ca0dda77f75a (diff) | |
| parent | 804e97fc77b3398db5461fdd79f2f96f6acf467d (diff) | |
| download | git-55dcc2ebad1b3ed4a6912f6f401f63cd3c71026f.zip git-55dcc2ebad1b3ed4a6912f6f401f63cd3c71026f.tar.gz git-55dcc2ebad1b3ed4a6912f6f401f63cd3c71026f.tar.bz2 | |
Merge the attributes fix in from maint-1.6.7 branch
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t0003-attributes.sh')
| -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 dbb2623..51f3045 100755 --- a/t/t0003-attributes.sh +++ b/t/t0003-attributes.sh @@ -159,6 +159,16 @@ test_expect_success 'relative paths' ' (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" && |