summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* indexer: avoid warning about `idx->pack`ethomson/packfile_closeEdward Thomson2017-01-211-1/+1
* indexer: introduce `git_packfile_close`Edward Thomson2017-01-213-14/+17
* Merge pull request #4016 from novalis/submodule-optimizationEdward Thomson2017-01-216-94/+235
|\
| * Skip submodule head/index update when caching.Brock Peabody2017-01-201-6/+15
| * Allow for caching of submodules.Brock Peabody2017-01-206-39/+171
| * Fix formattingDavid Turner2017-01-201-71/+71
* | Merge branch 'pr/4060'Edward Thomson2017-01-212-1/+59
|\ \ | |/ |/|
| * indexer: only delete temp file if it was unusedEdward Thomson2017-01-211-5/+7
| * Addressed review feedbacklhchavez2017-01-142-15/+8
| * Close the file before unlinkinglhchavez2017-01-031-0/+6
| * Fix the memory leaklhchavez2017-01-031-1/+9
| * Add a testlhchavez2017-01-011-0/+40
| * Delete temporary packfile in indexerlhchavez2017-01-011-0/+9
* | Merge pull request #4055 from ethomson/ethomson/ntlmCarlos Martín Nieto2017-01-161-63/+60
|\ \
| * | WinHTTP: support best auth mechanismEdward Thomson2017-01-161-63/+60
|/ /
* | Merge pull request #4054 from jfultz/jfultz/fix_GIT_CHECKOUT_DISABLE_PATHSPEC...Edward Thomson2017-01-142-0/+42
|\ \
| * | Fix handling of GIT_CHECKOUT_DISABLE_PATHSPEC_MATCH flag.John Fultz2016-12-292-0/+42
* | | Merge pull request #4061 from libgit2/ethomson/merge_optsCarlos Martín Nieto2017-01-144-5/+12
|\ \ \
| * | | CHANGELOG: update `GIT_MERGE_OPTIONS_INIT` changesethomson/merge_optsEdward Thomson2017-01-141-0/+4
| * | | merge: set default rename thresholdEdward Thomson2017-01-013-5/+8
* | | | Merge pull request #4049 from libgit2/ethomson/error_msgsCarlos Martín Nieto2017-01-1398-501/+501
|\ \ \ \
| * | | | tests: update error message checkingethomson/error_msgsEdward Thomson2016-12-294-5/+5
| * | | | giterr_set: consistent error messagesEdward Thomson2016-12-2994-496/+496
| | |/ / | |/| |
* | | | Merge pull request #4074 from fcharlie/masterEdward Thomson2017-01-111-1/+1
|\ \ \ \
| * | | | fix examples/network/clone.c: heap-buffer-overflowForce.Charlie-I2017-01-091-1/+1
* | | | | Merge remote-tracking branch 'upstream/maint/v0.25'Carlos Martín Nieto2017-01-094-19/+49
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | 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 #4065 from simonbyrne/sb/changelogEdward Thomson2017-01-061-5/+6
|\ \ \ \ | |_|_|/ |/| | |
| * | | move git_merge_options changes to correct locationSimon Byrne2017-01-031-4/+4
| * | | mention field addition in breaking API changesSimon Byrne2017-01-031-1/+2
|/ / /
* | | Merge pull request #4015 from staticfloat/sf/win_http_parserEdward Thomson2016-12-311-13/+12
|\ \ \
| * | | CMakeLists: Move `http-parser` block down by `zlib`, update error messageElliot Saba2016-12-301-13/+12
| * | | Allow Windows with WinHTTP to use external http-parserElliot Saba2016-11-201-13/+13
* | | | Merge pull request #4052 from dglsswnsn/masterEdward Thomson2016-12-301-4/+6
|\ \ \ \
| * | | | Fix issue #4046 Seg fault in config_files()Douglas Swanson2016-12-291-4/+6
| | |_|/ | |/| |
* | | | Merge pull request #4043 from fudanchii/fudanchii/openbsdEdward Thomson2016-12-301-1/+1
|\ \ \ \ | |/ / / |/| | |
| * | | Fix BIO_* functions method linking when compiled with libressl.Nurahmadie2016-12-241-1/+1
| | |/ | |/|
* | | Merge pull request #4048 from jacquesg/rebase-error-checkEdward Thomson2016-12-291-1/+1
|\ \ \
| * | | rebase: check the result code of rebase_init_mergeJacques Germishuys2016-12-291-1/+1
|/ / /
* | | Merge pull request #4044 from jacquesg/mempack-versionEdward Thomson2016-12-271-0/+1
|\ \ \ | |/ / |/| |
| * | mempack: set the odb backend versionJacques Germishuys2016-12-251-0/+1
|/ /