summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* hash: set error messages on failureethomson/odb_alloc_errorEdward Thomson2018-02-091-8/+33
* odb: error when we can't create object headerEdward Thomson2018-02-095-30/+63
* odb: assert on logic errors when writing objectsEdward Thomson2018-02-091-2/+1
* git_odb__hashfd: propagate error on failuresEdward Thomson2018-02-091-1/+1
* git_odb__hashobj: provide errors messages on failuresEdward Thomson2018-02-091-4/+8
* odb: check for alloc errors on hardcoded objectsEdward Thomson2018-02-091-6/+14
* odb: error when we can't alloc an objectEdward Thomson2018-02-091-2/+6
* Merge pull request #4450 from libgit2/ethomson/odb_loose_readstreamEdward Thomson2018-02-088-225/+555
|\
| * odb_loose: HEADER_LEN -> MAX_HEADER_LENethomson/odb_loose_readstreamEdward Thomson2018-02-011-7/+7
| * odb_loose: largefile tests only on 64 bit platformsEdward Thomson2018-02-011-1/+14
| * odb_loose: validate length when checking for zlib contentEdward Thomson2018-02-011-4/+7
| * odb_loose: test read_header on large blobsEdward Thomson2018-02-011-0/+16
| * odb_loose: test read_header explicitlyEdward Thomson2018-02-011-0/+30
| * odb_loose: `read_header` for packlike loose objectsEdward Thomson2018-02-011-20/+46
| * odb_loose: read_header should use zstreamEdward Thomson2018-02-011-85/+24
| * zstream: introduce a single chunk readerEdward Thomson2018-02-012-36/+55
| * odb: test loose object streamingEdward Thomson2018-02-011-0/+54
| * odb_loose: packlike loose objects use `git_zstream`Edward Thomson2018-02-011-88/+71
| * odb: loose object streaming for packlike loose objectsEdward Thomson2018-02-011-37/+84
| * odb_loose: test reading a large file in streamEdward Thomson2018-02-011-1/+47
| * odb: introduce streaming loose object readerEdward Thomson2018-02-011-7/+148
| * odb: provide length and type with streaming readEdward Thomson2018-02-013-4/+17
| * odb_loose: stream -> writestreamEdward Thomson2018-02-011-8/+8
* | Merge pull request #4491 from libgit2/ethomson/recursiveEdward Thomson2018-02-08100-29/+120
|\ \
| * | merge: virtual commit should be last argument to merge-baseethomson/recursiveTyrie Vella2018-02-041-2/+8
| * | Add failing test case for virtual commit merge base issueEdward Thomson2018-02-0427-0/+32
| * | merge::trees::recursive: test for virtual base buildingEdward Thomson2018-02-041-0/+25
| * | merge: reverse merge bases for recursive mergeEdward Thomson2018-02-044-28/+32
| * | oidarray: introduce git_oidarray__reverseEdward Thomson2018-02-042-0/+13
| * | Introduce additional criss-cross merge branchesEdward Thomson2018-02-0468-0/+11
* | | Merge pull request #4521 from pks-t/pks/config-crlf-linesEdward Thomson2018-02-084-11/+60
|\ \ \
| * | | buf_text: remove `offset` parameter of BOM detection functionPatrick Steinhardt2018-02-083-11/+9
| * | | config_parse: fix reading files with BOMPatrick Steinhardt2018-02-082-1/+16
| * | | config_parse: handle empty lines with CRLFPatrick Steinhardt2018-02-082-0/+31
| * | | config_parse: add comment to clarify logic getting next characterPatrick Steinhardt2018-02-081-0/+5
|/ / /
* | | Merge pull request #4513 from libgit2/ethomson/cmake_fixesEdward Thomson2018-02-074-60/+63
|\ \ \ | |/ / |/| |
| * | cmake: move ENABLE_WARNINGS to a moduleethomson/cmake_fixesEdward Thomson2018-02-052-15/+15
| * | cmake: Move IDE source munging to a moduleEdward Thomson2018-02-022-23/+23
| * | cmake: move nanosecond detection to a moduleEdward Thomson2018-02-022-21/+21
| * | cmake: enable policy CMP0042Edward Thomson2018-02-021-0/+3
| * | cmake: test for CMP0051 instead of version checkEdward Thomson2018-02-021-1/+1
* | | Merge pull request #4489 from libgit2/ethomson/conflicts_crlfEdward Thomson2018-02-0417-133/+326
|\ \ \ | |/ / |/| |
| * | merge: test CR/LF conflicts for CR/LF filesethomson/conflicts_crlfEdward Thomson2018-01-211-0/+48
| * | xdiff: upgrade to git's included xdiffEdward Thomson2018-01-2116-133/+278
* | | Merge pull request #4499 from pks-t/pks/setuid-configEdward Thomson2018-02-021-7/+74
|\ \ \
| * | | sysdir: do not use environment in setuid casePatrick Steinhardt2018-02-021-7/+74
| |/ /
* | | Merge pull request #4512 from libgit2/ethomson/header_guardsEdward Thomson2018-02-0248-86/+92
|\ \ \
| * | | consistent header guardsethomson/header_guardsEdward Thomson2018-02-0148-86/+92
| | |/ | |/|
* | | Merge pull request #4510 from pks-t/pks/attr-file-bare-statEdward Thomson2018-02-022-4/+20
|\ \ \ | |/ / |/| |
| * | attr: avoid stat'ting files for bare repositoriesPatrick Steinhardt2018-02-012-4/+20
View Lorry Controller Status