summaryrefslogtreecommitdiff
path: root/src
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-094-27/+60
* 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-084-222/+385
|\
| * odb_loose: HEADER_LEN -> MAX_HEADER_LENethomson/odb_loose_readstreamEdward Thomson2018-02-011-7/+7
| * odb_loose: validate length when checking for zlib contentEdward Thomson2018-02-011-4/+7
| * 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_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: introduce streaming loose object readerEdward Thomson2018-02-011-7/+148
| * odb: provide length and type with streaming readEdward Thomson2018-02-011-2/+7
| * odb_loose: stream -> writestreamEdward Thomson2018-02-011-8/+8
* | Merge pull request #4491 from libgit2/ethomson/recursiveEdward Thomson2018-02-083-8/+31
|\ \
| * | merge: virtual commit should be last argument to merge-baseethomson/recursiveTyrie Vella2018-02-041-2/+8
| * | merge: reverse merge bases for recursive mergeEdward Thomson2018-02-041-7/+11
| * | oidarray: introduce git_oidarray__reverseEdward Thomson2018-02-042-0/+13
* | | buf_text: remove `offset` parameter of BOM detection functionPatrick Steinhardt2018-02-083-11/+9
* | | config_parse: fix reading files with BOMPatrick Steinhardt2018-02-081-1/+1
* | | config_parse: handle empty lines with CRLFPatrick Steinhardt2018-02-081-0/+1
* | | config_parse: add comment to clarify logic getting next characterPatrick Steinhardt2018-02-081-0/+5
|/ /
* | Merge pull request #4489 from libgit2/ethomson/conflicts_crlfEdward Thomson2018-02-0416-133/+278
|\ \
| * | 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
* | | Merge pull request #4507 from tomas/patch-1Edward Thomson2018-01-311-2/+7
|\ \ \
| * | | Set ctime/mtime nanosecs to 0 if USE_NSEC is not definedTomás Pollak2018-01-311-0/+3
| * | | Honor 'GIT_USE_NSEC' option in `filesystem_iterator_set_current`Tomás Pollak2018-01-301-2/+4
* | | | Merge pull request #4488 from libgit2/ethomson/conflict_marker_sizeEdward Thomson2018-01-312-0/+3
|\ \ \ \ | |/ / / |/| | |
| * | | merge: recursive uses larger conflict markersEdward Thomson2018-01-211-0/+1
| * | | merge: allow custom conflict marker sizeEdward Thomson2018-01-211-0/+2
| | |/ | |/|
* | | odb: reject reading and writing null OIDsPatrick Steinhardt2018-01-261-1/+25
* | | tree: reject writing null-OID entries to a treePatrick Steinhardt2018-01-261-0/+6
| |/ |/|
* | odb: export mempack backendAdrián Medraño Calvo2018-01-221-0/+1
|/
* Merge pull request #4484 from pks-t/pks/fail-creating-branch-HEADEdward Thomson2018-01-201-0/+6
|\
| * branch: refuse creating branches named 'HEAD'Patrick Steinhardt2018-01-191-0/+6
* | Merge pull request #4478 from libgit2/cmn/packed-refs-sortedEdward Thomson2018-01-201-1/+1
|\ \ | |/ |/|
| * refs: include " sorted " in our packed-refs headercmn/packed-refs-sortedCarlos Martín Nieto2018-01-121-1/+1
* | Merge pull request #4451 from libgit2/charliesome/trailer-infoBrian Lopez2018-01-171-0/+416
|\ \
| * | rename find_trailer to extract_trailer_blockcharliesome/trailer-infoBrian Lopez2018-01-171-2/+2
| * | Change trailer API to return a simple arrayBrian Lopez2018-01-161-5/+19