diff options
| author | Junio C Hamano <gitster@pobox.com> | 2008-04-23 00:03:56 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-04-23 00:03:56 -0700 |
| commit | 57cf5ca3058b4086744f59f1f520a15dfc040bbb (patch) | |
| tree | b89a069c701db1d5eb64d7c74928b2f66db9833d /t | |
| parent | bdb87afb4b425d97f7b5e957cbed1589969d9a24 (diff) | |
| parent | d6958a1a32814af69a7571daa45252018c61f969 (diff) | |
| download | git-57cf5ca3058b4086744f59f1f520a15dfc040bbb.tar.gz | |
Merge branch 'maint'
* maint:
Amend git-push refspec documentation
git-gc --prune is deprecated
svn-git: Use binmode for reading/writing binary rev maps
diff options documentation: refer to --diff-filter in --name-status
Don't force imap.host to be set when imap.tunnel is set
git-clone.txt: Adjust note to --shared for new pruning behavior of git-gc
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 3faf135e38..c56d2fbaba 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 |