summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* ci: pull libssh2 from www.libssh2.orgethomson/ci_libssh2Edward Thomson2021-09-214-6/+4
* Merge pull request #6020 from lolgear/refactoring/stdint_ifdef_condition_has_...Edward Thomson2021-09-201-3/+3
|\
| * include: stdint header condition has been reverted.Dmitry Lobanov2021-08-301-3/+3
* | Merge branch 'sathieu/patch-1' into mainEdward Thomson2021-09-201-0/+9
|\ \
| * | httpproxy: move empty string test above configEdward Thomson2021-09-201-4/+9
| * | Add test to ensure empty proxy env behaves like unset envMathieu Parent2021-09-141-0/+4
* | | Merge branch 'longpath_filter_bug' into mainEdward Thomson2021-09-201-4/+23
|\ \ \
| * | | win32: ensure content filtering occurs in longpath testEdward Thomson2021-09-201-4/+23
|/ / /
* | | Merge remote-tracking branch 'mathworks/longpath_filter_bug' into mainEdward Thomson2021-09-202-7/+28
|\ \ \
| * | | Apply suggestions from code reviewLaurence McGlashan2021-09-141-0/+2
| * | | Refactor shared code in longpath test.Laurence McGlashan2021-09-141-22/+12
| * | | If longpaths is true and filters are enabled, pass git_repository through the...Laurence McGlashan2021-09-142-3/+32
| |/ /
* | | Merge pull request #6058 from mathworks/proxy_config_with_detached_remoteEdward Thomson2021-09-202-5/+52
|\ \ \
| * | | Update remote.cLaurence McGlashan2021-09-181-1/+1
| * | | Apply suggestions from code reviewLaurence McGlashan2021-09-181-7/+2
| * | | Update formatting.Laurence McGlashan2021-09-161-3/+3
| * | | Allow proxy options when connecting with a detached remote.Laurence McGlashan2021-09-162-4/+56
* | | | Merge pull request #6060 from ccstolley/ccs_merge_bugfixEdward Thomson2021-09-2010-2/+65
|\ \ \ \
| * | | | Add test for revert+rename bug.Colin Stolley2021-09-159-0/+60
| * | | | merge: Check file mode when resolving renames.Colin Stolley2021-09-151-2/+5
| |/ / /
* | | | Merge pull request #6050 from shijinglu/patch-1Edward Thomson2021-09-181-0/+1
|\ \ \ \ | |/ / / |/| | |
| * | | Update README.mdshijing2021-09-121-0/+1
| |/ /
* | | Merge pull request #6053 from stac47/ssh2_discoveryEdward Thomson2021-09-142-0/+20
|\ \ \
| * | | Update src/CMakeLists.txtLaurent Stacul2021-09-141-7/+7
| * | | Discover libssh2 without pkg-configLaurent Stacul2021-09-142-0/+20
| |/ /
* | | Merge pull request #6041 from Esri/duncan/typeofEdward Thomson2021-09-142-8/+2
|\ \ \
| * | | Use __typeof__ GNUC keyword for ISO C compatibilityDuncan Thomson2021-09-082-8/+2
| |/ /
* | | Merge pull request #6039 from lhchavez/avoid-mmap-in-git-indexer-appendEdward Thomson2021-09-141-3/+37
|\ \ \
| * | | Avoid double negatives in the justification for truncationlhchavez2021-09-081-2/+5
| * | | Only avoid `mmap(2)`/`ftruncate(2)` when in non-Windowslhchavez2021-09-081-2/+84
| * | | Also remove a `ftruncate(2)` call in `git_indexer_commit`lhchavez2021-09-071-6/+0
| * | | indexer: Avoid one `mmap(2)`/`munmap(2)` pair per `git_indexer_append` calllhchavez2021-09-071-47/+2
* | | | Merge pull request #6031 from libgit2/ethomson/extensionsEdward Thomson2021-09-147-46/+276
|\ \ \ \
| * | | | common: support custom repository extensionsethomson/extensionsEdward Thomson2021-09-046-4/+232
| * | | | repo: refactor extensions tests into their own fileEdward Thomson2021-09-032-42/+44
* | | | | Merge pull request #6045 from punkymaniac/qa-fix-coding-style-pointerEdward Thomson2021-09-1434-76/+76
|\ \ \ \ \
| * | | | | Fix coding style for pointerpunkymaniac2021-09-0934-76/+76
| | |_|/ / | |/| | |
* | | | | Merge pull request #6043 from basile-henry/config-multiline-comment-charsEdward Thomson2021-09-143-1/+13
|\ \ \ \ \
| * | | | | Fix multiline strip_comments logicBasile Henry2021-09-091-1/+1
| * | | | | Add test config parsingBasile Henry2021-09-092-0/+12
| |/ / / /
* | | | | Merge pull request #6047 from libgit2/ethomson/notes_cleanupEdward Thomson2021-09-141-28/+28
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | notes: use a buffer internallyethomson/notes_cleanupEdward Thomson2021-09-101-28/+28
|/ / / /
* | | | README: update build badges for our branchesEdward Thomson2021-09-051-1/+1
| |/ / |/| |
* | | Merge pull request #6032 from lhchavez/git-extern-git-remote-name-is-validEdward Thomson2021-09-041-1/+1
|\ \ \ | |/ / |/| |
| * | remote: Mark `git_remote_name_is_valid` as `GIT_EXTERN`lhchavez2021-09-041-1/+1
|/ /
* | Merge pull request #6029 from arroz/fix_6028Edward Thomson2021-09-021-1/+2
|\ \
| * | #6028: Check if `threadstate->error_t.message` is not `git_buf__initbuf` befo...Miguel Arroz2021-09-021-1/+2
|/ /
* | url: ensure minimum components for formattingv1.2.0maint/v1.2Edward Thomson2021-09-011-2/+3
* | url: ensure minimum components for formattingEdward Thomson2021-09-011-0/+3
* | Merge pull request #6026 from libgit2/ethomson/proxyEdward Thomson2021-09-0114-107/+565
|\ \
View Lorry Controller Status