diff options
| author | Shawn O. Pearce <spearce@spearce.org> | 2007-10-19 05:18:55 (GMT) |
|---|---|---|
| committer | Shawn O. Pearce <spearce@spearce.org> | 2007-10-19 05:18:55 (GMT) |
| commit | f5bf6feb05b8c89c448ded6e6fad0eb58ef35463 (patch) | |
| tree | 9f166b46e5005a38d0aeb59a9b4880b508578688 /t | |
| parent | d7e56dbc4f60f6bd238e8612783541d89f006fb7 (diff) | |
| parent | bbaf63f2f18242484868d6c03d5df9bd071d6deb (diff) | |
| download | git-f5bf6feb05b8c89c448ded6e6fad0eb58ef35463.zip git-f5bf6feb05b8c89c448ded6e6fad0eb58ef35463.tar.gz git-f5bf6feb05b8c89c448ded6e6fad0eb58ef35463.tar.bz2 | |
Merge branch 'maint'
* maint:
Further 1.5.3.5 fixes described in release notes
Avoid invoking diff drivers during git-stash
attr: fix segfault in gitattributes parsing code
Define NI_MAXSERV if not defined by operating system
Ensure we add directories in the correct order
Avoid scary errors about tagged trees/blobs during git-fetch
Diffstat (limited to 't')
| -rwxr-xr-x | t/t0020-crlf.sh | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/t/t0020-crlf.sh b/t/t0020-crlf.sh index 0807d9f..62bc4bb 100755 --- a/t/t0020-crlf.sh +++ b/t/t0020-crlf.sh @@ -371,4 +371,11 @@ test_expect_success 'in-tree .gitattributes (4)' ' } ' +test_expect_success 'invalid .gitattributes (must not crash)' ' + + echo "three +crlf" >>.gitattributes && + git diff + +' + test_done |