summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #4072 from libgit2/ethomson/025_relnotesmaint/v0.25Carlos Martín Nieto2017-05-201-5/+6
|\
| * move git_merge_options changes to correct locationethomson/025_relnotesSimon Byrne2017-01-061-4/+4
| * mention field addition in breaking API changesSimon Byrne2017-01-061-1/+2
* | Merge pull request #4076 from libgit2/cmn/sec-update-25v0.25.1Carlos Martín Nieto2017-01-095-21/+51
|\ \ | |/ |/|
| * https: don't test that RC4 is invalidcmn/sec-update-25Carlos Martín Nieto2017-01-091-0/+3
| * http: correct the expected error for RC4Carlos Martín Nieto2017-01-091-2/+4
| * Bump version to 0.25.1Edward Thomson2017-01-061-2/+2
| * Merge branch '25_smartpktparse' into maint/v0.25Edward Thomson2017-01-062-16/+13
| |\
| | * smart_pkt: treat empty packet lines as errorPatrick Steinhardt2017-01-062-16/+5
| | * smart_pkt: verify packet length exceeds PKT_LEN_SIZEPatrick Steinhardt2017-01-061-0/+8
| |/ |/|
| * Merge branch '25_certcheckcb' into maint/v0.25Edward Thomson2017-01-062-2/+30
| |\ |/ /
| * http: perform 'badssl' check also via certificate callbackCarlos Martín Nieto2017-01-061-0/+29
| * http: check certificate validity before clobbering the error variableEtienne Samson2017-01-061-2/+1
|/
* Merge pull request #3980 from tiennou/doc-fixesv0.25.0-rc2v0.25.0Carlos Martín Nieto2016-12-203-5/+17
|\
| * transaction: fix documentationEtienne Samson2016-11-011-0/+9
| * remote: fix documentation and indentEtienne Samson2016-11-011-1/+3
| * remote: unused function typedefEtienne Samson2016-11-011-2/+0
| * describe: fix documentationEtienne Samson2016-11-011-2/+5
* | Merge pull request #4041 from libgit2/cmn/bump-pretend-gitEdward Thomson2016-12-201-1/+1
|\ \
| * | http: bump the pretend git version in the User-Agentcmn/bump-pretend-gitCarlos Martín Nieto2016-12-201-1/+1
|/ /
* | Merge pull request #4034 from libgit2/cmn/sysdir-no-reguessEdward Thomson2016-12-202-1/+22
|\ \
| * | sysdir: don't guess the paths again when $PATH is specifiedcmn/sysdir-no-reguessCarlos Martín Nieto2016-12-181-1/+1
| * | sysdir: add failing test for variable substitutionCarlos Martín Nieto2016-12-181-0/+21
* | | Merge pull request #4032 from libgit2/cmn/https-cap-no-hardcodeEdward Thomson2016-12-202-0/+20
|\ \ \
| * | | settings: clarify what each value meanscmn/https-cap-no-hardcodeCarlos Martín Nieto2016-12-171-0/+18
| * | | settings: don't hard-code HTTPS capabilityCarlos Martín Nieto2016-12-171-0/+2
| |/ /
* | | Merge pull request #4037 from libgit2/cmn/goalsCarlos Martín Nieto2016-12-201-3/+11
|\ \ \
| * | | README: be more explicit in the goals and scopecmn/goalsCarlos Martín Nieto2016-12-191-3/+11
* | | | Merge pull request #4038 from lucasderraugh/patch-1Carlos Martín Nieto2016-12-191-1/+1
|\ \ \ \
| * | | | Gift deprecated in favor of SwiftGit2Lucas Derraugh2016-12-191-1/+1
* | | | | Merge pull request #4026 from libgit2/cmn/refdb-fs-errorsCarlos Martín Nieto2016-12-191-2/+2
|\ \ \ \ \
| * | | | | refdb: bubble up recursive rm when locking a refcmn/refdb-fs-errorsCarlos Martín Nieto2016-12-161-2/+2
| | |_|/ / | |/| | |
* | | | | Merge pull request #4027 from pks-t/pks/pack-deref-cache-on-errorCarlos Martín Nieto2016-12-191-1/+4
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | pack: dereference cached pack entry on errorPatrick Steinhardt2016-12-121-1/+4
* | | | | Merge pull request #4033 from andhe/masterCarlos Martín Nieto2016-12-191-1/+1
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | Fix off-by-one problems in git_signature__parseAndreas Henriksson2016-12-171-1/+1
|/ / / /
* | | | Merge pull request #4031 from libgit2/cmn/plug-test-leakCarlos Martín Nieto2016-12-171-0/+1
|\ \ \ \ | |_|/ / |/| | |
| * | | rebase: plug a leak in the testscmn/plug-test-leakCarlos Martín Nieto2016-12-171-0/+1
|/ / /
* | | Merge pull request #4029 from libgit2/cmn/windows-no-concurrent-compressv0.24.4Edward Thomson2016-12-151-2/+8
|\ \ \
| * | | refdb: disable concurrent compress in the threading tests on Windowscmn/windows-no-concurrent-compressCarlos Martín Nieto2016-12-121-2/+8
| |/ /
* | | Merge pull request #4018 from pks-t/pks/various-fixesCarlos Martín Nieto2016-12-128-12/+13
|\ \ \ | |/ / |/| |
| * | Fix potential use of uninitialized valuesPatrick Steinhardt2016-12-123-3/+5
| * | graph: flag fields should be declared as unsignedPatrick Steinhardt2016-12-121-1/+1
| * | transports: smart: do not redeclare loop countersPatrick Steinhardt2016-12-121-4/+4
| * | path: remove unused local variablePatrick Steinhardt2016-12-121-1/+0
| * | revwalk: do not re-declare `commit` variablePatrick Steinhardt2016-12-121-1/+1
| * | odb_mempack: mark zero-length array as GIT_FLEX_ARRAYPatrick Steinhardt2016-12-121-1/+1
| * | clar: mark `cl_git_thread_check()` as inlinePatrick Steinhardt2016-12-121-1/+1
|/ /
* | Merge pull request #4020 from novalis/rebase-detachedEdward Thomson2016-12-072-1/+54
|\ \
| * | git_rebase_init: correctly handle detached HEADDavid Turner2016-12-012-1/+54