summaryrefslogtreecommitdiff
path: root/src
Commit message (Expand)AuthorAgeFilesLines
* object_type: use new enumeration namesethomson/index_fixesEdward Thomson2018-12-0147-311/+311
* index: use new enum and structure namesEdward Thomson2018-12-015-55/+56
* Merge pull request #4770 from tiennou/feature/merge-analysis-any-branchPatrick Steinhardt2018-11-304-10/+63
|\
| * merge: assert that we're passed sane parametersEtienne Samson2018-10-191-2/+2
| * merge: make analysis possible against a non-HEAD referenceEtienne Samson2018-10-193-8/+59
| * repository: assert that we're passed a valid head pointerEtienne Samson2018-10-161-0/+2
* | Merge pull request #4888 from TheBB/add-cbPatrick Steinhardt2018-11-291-7/+3
|\ \
| * | revwalk: Allow changing hide_cbEivind Fonn2018-11-281-7/+3
* | | Merge pull request #4895 from pks-t/pks/unused-warningsPatrick Steinhardt2018-11-2926-146/+191
|\ \ \
| * | | khash: move khash include into implementation filesPatrick Steinhardt2018-11-288-43/+54
| * | | khash: remove intricate knowledge of khash typesPatrick Steinhardt2018-11-2819-54/+51
| * | | khash: implement map-specific foreach macrosPatrick Steinhardt2018-11-284-5/+46
| * | | khash: implement begin/end via functions instead of macrosPatrick Steinhardt2018-11-286-5/+41
| * | | submodule: remove string map implementation that strips trailing slashesPatrick Steinhardt2018-11-281-29/+0
| * | | idxmap: remove unused foreach macrosPatrick Steinhardt2018-11-281-3/+0
| * | | iterator: remove unused function `tree_iterator_entry_cmp`Patrick Steinhardt2018-11-281-8/+0
* | | | Merge pull request #4870 from libgit2/ethomson/proxyEdward Thomson2018-11-2822-746/+956
|\ \ \ \
| * | | | http: reset replay_count upon connectionethomson/proxyEdward Thomson2018-11-281-0/+1
| * | | | stream registration: take an enum typeEdward Thomson2018-11-284-20/+37
| * | | | http: don't allow SSL connections to a proxyEdward Thomson2018-11-281-1/+9
| * | | | http: only load proxy configuration during connectionEdward Thomson2018-11-281-2/+4
| * | | | stream: provide generic registration APIEdward Thomson2018-11-286-73/+163
| * | | | http: disallow repeated headers from serversEdward Thomson2018-11-281-9/+18
| * | | | http: remove cURLEdward Thomson2018-11-289-466/+2
| * | | | streams: remove unused tls functionsEdward Thomson2018-11-285-42/+12
| * | | | http: use CONNECT to talk to proxiesEdward Thomson2018-11-281-13/+224
| * | | | tls: introduce a wrap functionEdward Thomson2018-11-2810-88/+297
| * | | | http transport: reset error message on cert failureEdward Thomson2018-11-281-11/+11
| * | | | http transport: support cert check for proxiesEdward Thomson2018-11-281-39/+70
| * | | | http transport: provide proxy credentialsEdward Thomson2018-11-284-8/+19
| * | | | http transport: refactor storageEdward Thomson2018-11-281-120/+133
| * | | | http transport: cap number of authentication replaysEdward Thomson2018-11-283-9/+10
| * | | | http transport: prompt for proxy credentialsEdward Thomson2018-11-281-19/+37
| * | | | http transport: further refactor credential handlingEdward Thomson2018-11-281-17/+32
| * | | | http transport: refactor credential handlingEdward Thomson2018-11-281-47/+58
| * | | | http transport: use HTTP proxies when requestedEdward Thomson2018-11-281-33/+80
| * | | | http: rename http subtransport's `io` to `gitserver_stream`Edward Thomson2018-11-281-29/+38
| * | | | http: rename `connection_data` -> `gitserver_data`Edward Thomson2018-11-281-20/+20
| * | | | proxy: propagate proxy configuration errorsEdward Thomson2018-11-281-1/+2
* | | | | Merge pull request #4898 from pks-t/pks/config-parent-is-fileEdward Thomson2018-11-281-1/+1
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | config: fix adding files if their parent directory is a filePatrick Steinhardt2018-11-281-1/+1
| |/ / /
* | | | Merge pull request #4879 from libgit2/ethomson/defer_cert_cred_cbPatrick Steinhardt2018-11-284-5/+23
|\ \ \ \ | |/ / / |/| | |
| * | | transport: allow cred/cert callbacks to return GIT_PASSTHROUGHethomson/defer_cert_cred_cbEdward Thomson2018-11-213-5/+13
| * | | transport: see if cert/cred callbacks exist before calling themEdward Thomson2018-11-151-0/+10
| |/ /
* | | Fix warning C4133 incompatible types in MSVCSven Strickroth2018-11-251-2/+2
* | | Merge pull request #4884 from libgit2/ethomson/index_iteratorPatrick Steinhardt2018-11-212-0/+51
|\ \ \
| * | | index: introduce git_index_iteratorethomson/index_iteratorEdward Thomson2018-11-142-0/+51
* | | | commit: fix out-of-bound reads when parsing truncated author fieldsPatrick Steinhardt2018-11-211-1/+1
* | | | Merge branch 'tiennou/fix/logallrefupdates-always'Edward Thomson2018-11-183-13/+30
|\ \ \ \
| * | | | refs: add support for core.logAllRefUpdates=alwaysEtienne Samson2018-11-183-13/+30