summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* regex: make sure to link against PCRE2's regex functionscmn/pcre2Carlos Martín Nieto2019-09-011-0/+13
* Merge pull request #5208 from mkostyuk/apply-removed-new-fileEdward Thomson2019-08-272-3/+42
|\
| * apply: free test dataEdward Thomson2019-08-271-1/+1
| * apply: Test for git_apply_to_tree failures when new files are addedMax Kostyukevich2019-08-211-0/+36
| * apply: git_apply_to_tree fails to apply patches that add new filesMax Kostyukevich2019-08-201-3/+6
* | Merge pull request #5189 from libgit2/ethomson/attrs_from_headEdward Thomson2019-08-2786-31/+459
|\ \
| * | filter: test second-level in-repo `.gitattributes`ethomson/attrs_from_headEdward Thomson2019-08-111-0/+23
| * | tests: add a subdirectory to crlf testsEdward Thomson2019-08-1112-5/+25
| * | filter: test we can filter a blob in a bare repoEdward Thomson2019-08-1168-0/+134
| * | blob: optionally read attributes from repositoryEdward Thomson2019-08-112-0/+9
| * | filter: optionally read attributes from repositoryEdward Thomson2019-08-112-0/+6
| * | attr: optionally read attributes from repositoryEdward Thomson2019-08-114-9/+65
| * | blob: allow blob filtering to ignore system gitattributesEdward Thomson2019-08-112-0/+9
| * | filter: add GIT_FILTER_NO_SYSTEM_ATTRIBUTES optionEdward Thomson2019-08-112-3/+11
| * | filter: test that system attributes can be ignoredEdward Thomson2019-08-111-0/+27
| * | filter: document GIT_FILTER_ALLOW_UNSAFEEdward Thomson2019-08-111-0/+2
| * | filter: ensure system attributes are readEdward Thomson2019-08-111-0/+54
| * | blob: deprecate `git_blob_filtered_content`Edward Thomson2019-08-113-35/+23
| * | blob: convert users of git_blob_filtered_contentEdward Thomson2019-08-112-14/+14
| * | blob: introduce git_blob_filterEdward Thomson2019-08-112-4/+68
| * | filter: add a crlf blob testEdward Thomson2019-07-211-0/+28
* | | Merge pull request #5196 from pks-t/pks/config-include-onbranchEdward Thomson2019-08-274-41/+187
|\ \ \
| * | | config: implement "onbranch" conditionalPatrick Steinhardt2019-08-012-1/+93
| * | | tests: config: catch OOM when assembling conditional configPatrick Steinhardt2019-08-011-3/+3
| * | | tests: config: assert behaviour around includesPatrick Steinhardt2019-08-012-0/+56
| * | | tests: config::snapshot: modernize testsPatrick Steinhardt2019-08-011-38/+36
* | | | Merge pull request #5213 from boardwalk/dskorupski/fix_include_caseEdward Thomson2019-08-251-1/+1
|\ \ \ \
| * | | | Fix include casing for case-sensitive filesystems.Dan Skorupski2019-08-241-1/+1
* | | | | Merge pull request #5054 from tniessen/util-use-64-bit-timerEdward Thomson2019-08-233-17/+7
|\ \ \ \ \
| * | | | | cmake: move _WIN32_WINNT definitions to rootTobias Nießen2019-08-174-12/+5
| * | | | | util: use 64 bit timer on WindowsTobias Nießen2019-07-291-15/+2
| * | | | | cmake: fix _WIN32_WINNT for MinGWTobias Nießen2019-07-292-0/+10
* | | | | | Merge pull request #5200 from pks-t/pks/memory-allocation-auditEdward Thomson2019-08-2312-59/+197
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |
| * | | | | util: do not perform allocations in insertsortPatrick Steinhardt2019-08-233-28/+117
| * | | | | xdiff: catch memory allocation errorsPatrick Steinhardt2019-08-232-0/+15
| * | | | | transports: http: check for memory allocation failuresPatrick Steinhardt2019-08-232-2/+7
| * | | | | trailer: check for memory allocation errorsPatrick Steinhardt2019-08-231-0/+5
| * | | | | posix: fix direct use of `malloc`Patrick Steinhardt2019-08-231-6/+6
| * | | | | indexer: catch OOM when adding expected OIDsPatrick Steinhardt2019-08-231-0/+1
| * | | | | merge: check return value of `git_commit_list_insert`Patrick Steinhardt2019-08-231-16/+25
| * | | | | blame_git: detect memory allocation errorsPatrick Steinhardt2019-08-231-7/+21
|/ / / / /
* | | | | Merge pull request #5187 from ianhattendorf/fix/clone-whitespaceEdward Thomson2019-08-143-2/+8
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | clone: Remove whitespace ssh testIan Hattendorf2019-08-131-15/+0
| * | | | clone: Update whitespace test urlIan Hattendorf2019-08-121-4/+4
| * | | | clone: whitespace in url ssh testIan Hattendorf2019-07-252-2/+18
| * | | | git_net_url_parse: don't git_buf_decode_percent for pathIan Hattendorf2019-07-241-1/+1
| * | | | clone: whitespace in url testIan Hattendorf2019-07-241-0/+5
* | | | | Merge pull request #5202 from libgit2/users/ethomson/security_updatesEdward Thomson2019-08-135-3/+113
|\ \ \ \ \
| * | | | | changelog: include security updatesusers/ethomson/security_updatesEdward Thomson2019-08-131-0/+10
| * | | | | commit_list: fix possible buffer overflow in `commit_quick_parse`Patrick Steinhardt2019-08-131-2/+6
View Lorry Controller Status