diff options
| author | Junio C Hamano <gitster@pobox.com> | 2008-04-23 06:37:06 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-04-23 06:37:06 (GMT) |
| commit | d6958a1a32814af69a7571daa45252018c61f969 (patch) | |
| tree | 355fe5cdd4749e67d8979f80f7dcdc649b9aba41 /t | |
| parent | 491b1b11213c373a3e91004b1ab775d7e52ac1f3 (diff) | |
| parent | 4f7ec7970874d09be162bc7f16415a0ec2d36ae5 (diff) | |
| download | git-d6958a1a32814af69a7571daa45252018c61f969.zip git-d6958a1a32814af69a7571daa45252018c61f969.tar.gz git-d6958a1a32814af69a7571daa45252018c61f969.tar.bz2 | |
Merge branch 'maint-1.5.4' into maint
* maint-1.5.4:
svn-git: Use binmode for reading/writing binary rev maps
diff options documentation: refer to --diff-filter in --name-status
git-svn bug with blank commits and author file
archive.c: format_subst - fixed bogus argument to memchr
copy.c: copy_fd - correctly report write errors
gitattributes: Fix subdirectory attributes specified from root directory
Diffstat (limited to 't')
| -rwxr-xr-x | t/t0003-attributes.sh | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/t/t0003-attributes.sh b/t/t0003-attributes.sh index 3faf135..c56d2fb 100755 --- a/t/t0003-attributes.sh +++ b/t/t0003-attributes.sh @@ -21,6 +21,7 @@ test_expect_success 'setup' ' mkdir -p a/b/d a/c && ( echo "f test=f" + echo "a/i test=a/i" ) >.gitattributes && ( echo "g test=a/g" && @@ -46,4 +47,11 @@ test_expect_success 'attribute test' ' ' +test_expect_success 'root subdir attribute test' ' + + attr_check a/i a/i && + attr_check subdir/a/i unspecified + +' + test_done |