summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* travis: fail on memory leaksethomson/fail_on_leaksEdward Thomson2017-11-161-1/+1
* Merge pull request #4414 from cpoerschke/master-test-status-codes-legendEdward Thomson2017-11-151-1/+1
|\
| * add test status codes legend to the 'Started' test traceChristine Poerschke2017-11-131-1/+1
|/
* Merge pull request #4412 from cpoerschke/master-tests-repo-init-tweakCarlos Martín Nieto2017-11-131-1/+1
|\
| * s/Init/Index comment tweak for test_repo_init__init_with_initial_commitChristine Poerschke2017-11-121-1/+1
* | Merge pull request #4408 from hkleynhans/pos_neg_zero_offset_sigPatrick Steinhardt2017-11-123-2/+35
|\ \
| * | signature: distinguish +0000 and -0000 UTC offsetsHenry Kleynhans2017-11-123-2/+35
| |/
* | Merge pull request #4406 from yoney/clarPatrick Steinhardt2017-11-121-2/+9
|\ \ | |/ |/|
| * clar: verify command line arguments before executeYoney2017-11-111-2/+9
* | Merge pull request #4310 from pks-t/pks/common-parserEdward Thomson2017-11-118-943/+945
|\ \ | |/ |/|
| * config_parse: use common parser interfacePatrick Steinhardt2017-11-113-195/+48
| * config_file: split out module to parse config filesPatrick Steinhardt2017-11-113-681/+746
| * parse: always initialize line pointerPatrick Steinhardt2017-11-112-4/+4
| * parse: implement `git_parse_peek`Patrick Steinhardt2017-11-113-5/+41
| * parse: implement and use `git_parse_advance_digit`Patrick Steinhardt2017-11-113-19/+25
| * patch_parse: use git_parse_contains_sPatrick Steinhardt2017-11-111-2/+2
| * parse: extract parse modulePatrick Steinhardt2017-11-115-227/+269
* | Merge pull request #4403 from hkleynhans/select_bundled_zlibEdward Thomson2017-11-112-12/+17
|\ \ | |/ |/|
| * cmake: Allow user to select bundled zlibHenry Kleynhans2017-11-112-12/+17
|/
* Merge pull request #4308 from pks-t/pks/header-state-machineEdward Thomson2017-11-112-46/+103
|\
| * patch_parse: fix parsing patches only containing exact renamesPatrick Steinhardt2017-09-012-0/+22
| * patch_parse: implement state machine for parsing patch headersPatrick Steinhardt2017-08-251-46/+81
* | Merge pull request #4401 from ktdreyer/describe-h-spellingEdward Thomson2017-11-101-1/+1
|\ \
| * | describe.h: fix spelling in commentsKen Dreyer2017-11-101-1/+1
|/ /
* | Merge pull request #4283 from tiennou/generic-tlsPatrick Steinhardt2017-11-0923-109/+207
|\ \
| * | cmake: move Darwin-specific block aroundEtienne Samson2017-10-232-15/+12
| * | cmake: Add USE_HTTPS as a CMake optionEtienne Samson2017-10-233-30/+57
| * | cmake: braces are not needed hereEtienne Samson2017-10-231-2/+2
| * | cmake: use FeatureSummary to display which features we end up usingEtienne Samson2017-10-232-0/+24
| * | cmake: make our macOS helpers more CMake-yEtienne Samson2017-10-233-28/+58
| * | cmake: fix indentation before enhancingEtienne Samson2017-10-232-12/+12
| * | https: correct some error messagesEtienne Samson2017-10-231-2/+2
| * | clar: exit immediately on initialization failureEtienne Samson2017-10-231-1/+6
| * | https: Prevent OpenSSL from namespace-leakingEtienne Samson2017-10-234-10/+23
| * | stream: Gather streams to src/streamsEtienne Samson2017-10-2316-29/+32
| * | cmake: simplify some HTTPS testsEtienne Samson2017-10-232-3/+2
* | | Merge pull request #4394 from libgit2/cmn/macos-ramdiskEdward Thomson2017-11-061-0/+9
|\ \ \
| * | | travis: let's try a 5GB ramdiskcmn/macos-ramdiskCarlos Martín Nieto2017-10-311-2/+2
| * | | travis: put clar's sandbox in a ramdisk on macOSCarlos Martín Nieto2017-10-311-0/+9
* | | | Merge pull request #4397 from pks-t/pks/appveyor-examplesEdward Thomson2017-11-063-4/+41
|\ \ \ \
| * | | | examples: network: fix Win32 linking errors due to getlinePatrick Steinhardt2017-11-061-2/+39
| * | | | appveyor: build examplesPatrick Steinhardt2017-11-062-2/+2
|/ / / /
* | | | Merge pull request #4386 from novalis/gitignore-ignore-spaceCarlos Martín Nieto2017-11-042-0/+20
|\ \ \ \
| * | | | Ignore trailing whitespace in .gitignore files (as git itself does)David Turner2017-10-292-0/+20
* | | | | CHANGELOG: add note about supporting conditional includesCarlos Martín Nieto2017-11-041-0/+2
* | | | | Merge pull request #4332 from pks-t/pks/conditional-includesCarlos Martín Nieto2017-11-0417-113/+359
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Merge remote-tracking branch 'upstream/master' into pks/conditional-includesCarlos Martín Nieto2017-11-0417-187/+649
| |\ \ \ \ | |/ / / / |/| | | |
* | | | | Merge pull request #4393 from libgit2/ethomson/pgpkeyCarlos Martín Nieto2017-10-311-1/+1
|\ \ \ \ \
| * | | | | travis: grab pgp key from www.edwardthomson.comEdward Thomson2017-10-301-1/+1
* | | | | | Merge pull request #4392 from libgit2/cmn/config-write-preserve-caseCarlos Martín Nieto2017-10-313-9/+47
|\ \ \ \ \ \ | |/ / / / / |/| | | | |