summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* 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 #4040 from tiennou/examples/mergePatrick Steinhardt2018-02-017-36/+447
|\
| * examples: zero out our options memory before useEtienne Samson2018-01-251-0/+2
| * examples: our/their can be NULLEtienne Samson2018-01-251-2/+4
| * examples: fix remaining review commentsEtienne Samson2018-01-251-0/+2
| * examples: move support code into static functionsEtienne Samson2018-01-251-81/+97
| * examples: hoist the merge analysis back into mainEtienne Samson2018-01-251-58/+39
| * examples: minor review fixupsEtienne Samson2018-01-251-10/+12
| * examples: add mergeEtienne Samson2018-01-251-0/+391
| * examples: Dead code & warningsEtienne Samson2018-01-251-7/+0
| * examples: Move xrealloc to common example codeEtienne Samson2018-01-253-10/+15
| * examples: Switch to the nifty argv helpers from commonEtienne Samson2018-01-252-19/+36
* | 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-317-8/+23
|\ \ \
| * | | CHANGELOG: include merge_file conflict marker sizeethomson/conflict_marker_sizeEdward Thomson2018-01-211-0/+6
| * | | merge: recursive uses larger conflict markersEdward Thomson2018-01-214-8/+9
| * | | merge: allow custom conflict marker sizeEdward Thomson2018-01-212-0/+8
| | |/ | |/|
* | | Merge pull request #4490 from libgit2/ethomson/apfs_precompose_fixesEdward Thomson2018-01-311-1/+7
|\ \ \ | |_|/ |/| |
| * | status::renames: write NFD instead of NFC filenameethomson/apfs_precompose_fixesEdward Thomson2018-01-211-1/+7
| |/
* | Merge pull request #4474 from pks-t/pks/null-oidEdward Thomson2018-01-294-1/+60
|\ \
| * | odb: reject reading and writing null OIDsPatrick Steinhardt2018-01-262-1/+43
| * | tree: reject writing null-OID entries to a treePatrick Steinhardt2018-01-262-0/+17
* | | Merge pull request #4502 from pks-t/pks/security-reportingEdward Thomson2018-01-291-0/+6
|\ \ \ | |/ / |/| |
| * | README.md: add notes on how to report security issuesPatrick Steinhardt2018-01-291-0/+6
|/ /
* | Merge pull request #4497 from medranocalvo/export-mempackPatrick Steinhardt2018-01-252-4/+6
|\ \ | |/ |/|
| * odb: export mempack backendAdrián Medraño Calvo2018-01-222-4/+6
|/
* 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 #4483 from libgit2/cmn/prettify-docsEdward Thomson2018-01-201-3/+2
|\ \ \
| * | | message: update docs for git_message_prettifycmn/prettify-docsCarlos Martín Nieto2018-01-191-3/+2
| | |/ | |/|
* | | Merge pull request #4481 from pks-t/pks/tests-online-clone-url-memleakCarlos Martín Nieto2018-01-191-0/+2
|\ \ \ | |/ / |/| |
| * | tests: online::clone: fix memory leak due to not freeing URLPatrick Steinhardt2018-01-181-0/+2
|/ /