summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* refs:iterator: add tests to recurse symlinksethomson/branch_symlinksEdward Thomson2017-12-301-18/+66
* iterator: cleanups with symlink dir handlingEdward Thomson2017-12-303-17/+32
* branches: Check symlinked subdirectoriesAndy Doan2017-12-293-1/+24
* Merge pull request #4021 from carlosmn/cmn/refspecs-fetchheadEdward Thomson2017-12-285-9/+113
|\
| * fetch: go over FETCH_HEAD just once when counting the prefixes in testCarlos Martín Nieto2017-12-261-21/+26
| * remote: append to FETCH_HEAD rather than overwrite for each refspecCarlos Martín Nieto2017-12-262-1/+18
| * futils: add a function to truncate a fileCarlos Martín Nieto2017-12-262-0/+15
| * fetch: add a failing test for FETCH_HEAD with multiple fetch refspecsCarlos Martín Nieto2017-12-261-0/+59
| * fetch: expand fetchhead test to cover providing multiple refspecsCarlos Martín Nieto2017-11-191-8/+16
* | Merge pull request #4285 from pks-t/pks/patches-with-whitespaceEdward Thomson2017-12-233-8/+58
|\ \
| * | patch_parse: allow parsing ambiguous patch headersPatrick Steinhardt2017-11-113-0/+32
| * | patch_parse: treat complete line after "---"/"+++" as pathPatrick Steinhardt2017-11-111-8/+26
* | | Merge pull request #4045 from lhchavez/fix-unpack-double-freeEdward Thomson2017-12-233-8/+68
|\ \ \
| * | | Fix unpack double freelhchavez2017-12-233-8/+68
|/ / /
* | | Merge pull request #4430 from tiennou/fix/openssl-x509-leakEdward Thomson2017-12-231-12/+17
|\ \ \
| * | | openssl: free the peer certificateEtienne Samson2017-12-161-1/+2
| * | | openssl: merge all the exit paths of verify_server_certEtienne Samson2017-12-161-11/+15
* | | | Merge pull request #4435 from lhchavez/ubsan-shift-overflowEdward Thomson2017-12-231-6/+6
|\ \ \ \
| * | | | Simplified overflow conditionlhchavez2017-12-151-3/+1
| * | | | Using unsigned insteadlhchavez2017-12-091-6/+8
| * | | | libFuzzer: Prevent a potential shift overflowlhchavez2017-12-081-1/+1
* | | | | Merge pull request #4402 from libgit2/ethomson/iconvEdward Thomson2017-12-232-3/+7
|\ \ \ \ \
| * | | | | cmake: let USE_ICONV be optional on macOSethomson/iconvEdward Thomson2017-11-112-3/+7
* | | | | | Merge pull request #4429 from novalis/delete-modify-submodule-mergeEdward Thomson2017-12-235-2/+44
|\ \ \ \ \ \
| * | | | | | Do not attempt to check out submodule as blob when merging a submodule modify...David Turner2017-12-045-2/+44
| | |/ / / / | |/| | | |
* | | | | | Merge pull request #4449 from libgit2/charliesome/git-authors-jonathan-tanEdward Thomson2017-12-191-0/+1
|\ \ \ \ \ \
| * | | | | | Add Jonathan Tan to git.git-authorsCharlie Somerville2017-12-191-0/+1
|/ / / / / /
* | | | | | Merge pull request #4447 from pks-t/pks/diff-file-contents-refcount-blobEdward Thomson2017-12-162-1/+42
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | diff_file: properly refcount blobs when initializing file contentsPatrick Steinhardt2017-12-152-1/+42
* | | | | | Merge pull request #4432 from lhchavez/fix-missing-trailerPatrick Steinhardt2017-12-152-0/+21
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | libFuzzer: Fix missing trailer crashlhchavez2017-12-082-0/+21
* | | | | | Merge pull request #4444 from tiennou/fix/4440Patrick Steinhardt2017-12-151-1/+3
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | stransport: provide error message on trust failuresEtienne Samson2017-12-141-1/+3
|/ / / / /
* | | | | Merge pull request #4431 from lhchavez/fix-stream-leakPatrick Steinhardt2017-12-082-0/+30
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | libFuzzer: Fix a git_packfile_stream leaklhchavez2017-12-062-0/+30
|/ / / /
* | | | Merge pull request #4318 from Uncommon/amend_statusEdward Thomson2017-12-013-7/+47
|\ \ \ \
| * | | | status: Add a baseline field to git_status_options for comparing to trees oth...David Catmull2017-11-303-7/+47
* | | | | Merge pull request #4427 from pks-t/pks/openssl-threadidEdward Thomson2017-12-011-0/+9
|\ \ \ \ \
| * | | | | openssl: fix thread-safety on non-glibc POSIX systemsPatrick Steinhardt2017-11-301-0/+9
* | | | | | Merge pull request #4426 from pks-t/pks/diff-flag-set-fixEdward Thomson2017-11-302-8/+1
|\ \ \ \ \ \
| * | | | | | diff_generate: fix unsetting diff flagsPatrick Steinhardt2017-11-301-1/+1
| * | | | | | diff: remove unused macros `DIFF_FLAG_*`Patrick Steinhardt2017-11-301-7/+0
| |/ / / / /
* | | | | | Merge pull request #4424 from tiennou/fix/incorrect-winhttp-cert-payloadEdward Thomson2017-11-301-1/+1
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | winhttp: pass the same payload as ssh & http transports when checking certifi...Etienne Samson2017-11-261-1/+1
* | | | | | Merge pull request #4422 from pks-t/pks/commit-msg-styleEdward Thomson2017-11-301-0/+16
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | CONTRIBUTING: add documentation of our commit message stylePatrick Steinhardt2017-11-241-0/+16
* | | | | | Merge pull request #4423 from apnadkarni/patch-1Patrick Steinhardt2017-11-251-0/+1
|\ \ \ \ \ \
| * | | | | | Include git2/worktree.h in git2.hapnadkarni2017-11-251-0/+1
|/ / / / / /
* | | | | | Merge pull request #4410 from libgit2/ethomson/readmeEdward Thomson2017-11-242-13/+85
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | README: add up some marketingEdward Thomson2017-11-241-2/+14
View Lorry Controller Status