summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* openssl: dynamically load libssl and symbols (optionally)ethomson/ssl_refactorEdward Thomson2021-08-1211-63/+875
| | | | | | | | | Provide an interface around OpenSSL to dynamically load the libraries and symbols, so that users can distribute a libgit2 library that is not linked directly against OpenSSL. This enables users to target multiple distributions with a single binary. This mechanism is optional and disabled by default. Configure cmake with -DUSE_HTTPS=OpenSSL-Dynamic to use it.
* openssl: separate legacy apiEdward Thomson2021-08-113-188/+249
| | | | | Refactor the OpenSSL stream implementation so that the legacy code is better abstracted. This will enable future development.
* Merge pull request #5989 from libgit2/ethomson/ci_nightlyEdward Thomson2021-08-141-5/+6
|\ | | | | ci: update nightly to use source path
| * ci: update nightly to use source pathethomson/ci_nightlyEdward Thomson2021-08-141-5/+6
| |
* | Merge pull request #5972 from libgit2/ethomson/http_empty_passwordEdward Thomson2021-08-141-2/+6
|\ \ | |/ |/| http: don't require a password
| * http: don't require a passwordethomson/http_empty_passwordEdward Thomson2021-08-051-2/+6
| | | | | | | | | | | | | | | | Attempt authentication when a username is presented but a password is not; this can happen in particular when users are doing token authentication and specifying the token in the URL itself. For example, `https://token@host/` is a valid URI and should be treated as a username of `token` with an empty password.
* | ci: final docs updateEdward Thomson2021-08-101-1/+1
| |
* | ci: build docs in source directory for consistencyEdward Thomson2021-08-101-9/+4
| | | | | | All the other workflows jobs check out into the `source` directory; do this in the documentation build job as well, for consistency across jobs.
* | ci: update path during documentation generationEdward Thomson2021-08-101-1/+1
| |
* | ci: update paths during docker buildEdward Thomson2021-08-101-0/+2
| |
* | Merge pull request #5854 from alexjg/respect-force-flag-in-remote-fetchEdward Thomson2021-08-102-0/+174
|\ \ | | | | | | Respect the force flag on refspecs in git_remote_fetch
| * | skip descendant check if remote ref not foundAlex Good2021-08-052-20/+7
| | |
| * | Merge branch 'main' into respect-force-flag-in-remote-fetchAlex Good2021-06-3010-14/+30
| |\ \
| * | | Fix memory sanitizer failures in testsAlex Good2021-06-301-15/+18
| | | |
| * | | Merge branch 'libgit2:main' into respect-force-flag-in-remote-fetchalexjg2021-06-110-0/+0
| |\ \ \
| * | | | Respect the force flag on refspecs in git_remote_fetchAlex Good2021-06-113-1/+185
| | | | |
* | | | | Merge pull request #5980 from libgit2/ethomson/dockerfileEdward Thomson2021-08-096-33/+30
|\ \ \ \ \ | | | | | | | | | | | | docker: remove the entrypoint
| * | | | | ci: remove the docker entrypointethomson/dockerfileEdward Thomson2021-08-096-33/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Omitting an entrypoint.sh to configure the container and instead depending on docker primitives allows us to be more portable. (If a distribution uses a different mechanism for adding users, we need not have multiple entrypoint.sh files or invariants within it; instead we can configure that in the dockerfile itself along with all the other distribution specific components.)
* | | | | | Merge pull request #5978 from boretrk/amigaEdward Thomson2021-08-091-3/+3
|\ \ \ \ \ \ | |/ / / / / |/| | | | | amiga: use ';' as path list separator on AmigaOS
| * | | | | amiga: use ';' as path list separator on AmigaOSPeter Pettersson2021-08-081-3/+3
|/ / / / / | | | | | | | | | | | | | | | Like on Windows ':' is used for volume names in absolute paths.
* | | | | Merge pull request #5962 from libgit2/ethomson/futimensEdward Thomson2021-07-313-1/+16
|\ \ \ \ \
| * | | | | cmake: extended futimens checking on macOSethomson/futimensEdward Thomson2021-07-303-1/+16
| | | | | |
* | | | | | README: link to more information about cmakeEdward Thomson2021-07-301-0/+2
| | | | | |
* | | | | | Merge pull request #5961 from libgit2/ethomson/odb_tests_priorityEdward Thomson2021-07-303-2/+11
|\ \ \ \ \ \ | |/ / / / / | | | | | | tests: reset odb backend priority
| * | | | | tests: reset odb backend priorityethomson/odb_tests_priorityEdward Thomson2021-07-303-2/+11
|/ / / / /
* | | | | Merge branch 'pr/5491'Edward Thomson2021-07-304-7/+50
|\ \ \ \ \
| * | | | | odb: Implement option for overriding of default odb backend priorityTony De La Nuez2021-07-304-7/+50
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Introduce GIT_OPT_SET_ODB_LOOSE_PRIORITY and GIT_OPT_SET_ODB_PACKED_PRIORITY to allow overriding the default priority values for the default ODB backends. Libgit2 has historically assumed that most objects for long- running operations will be packed, therefore GIT_LOOSE_PRIORITY is set to 1 by default, and GIT_PACKED_PRIORITY to 2. When a client allows libgit2 to set the default backends, they can specify an override for the two priority values in order to change the order in which each ODB backend is accessed.
* | | | | | Merge pull request #5957 from lhchavez/fix-master-buildEdward Thomson2021-07-301-0/+2
|\ \ \ \ \ \ | |/ / / / / |/| | | | | Fix one memory leak in master
| * | | | | Fix one memory leak in masterlhchavez2021-07-301-0/+2
|/ / / / / | | | | | | | | | | | | | | | There was one test that wasn't correctly disposing of the repository.
* | | | | Merge branch 'pr/5861'Edward Thomson2021-07-303-3/+49
|\ \ \ \ \
| * | | | | tests: reformat upstream mergeEdward Thomson2021-07-301-5/+5
| | | | | |
| * | | | | tests: upstream merge test has been added.Dmitry Lobanov2021-06-181-0/+23
| | | | | |
| * | | | | branch: git branch upstream with format format name parameter has been added.Dmitry Lobanov2021-05-181-28/+3
| | | | | |
| * | | | | branch: git branch upstream functions layouts have been fixed.Dmitry Lobanov2021-05-161-4/+6
| | | | | |
| * | | | | branch: git branch upstream format enum has been added.Dmitry Lobanov2021-05-161-4/+27
| | | | | |
| * | | | | branch: git branch upstream functions layouts have been fixed.Dmitry Lobanov2021-05-161-2/+4
| | | | | |
| * | | | | branch: git branch upstream merge has been exposed.Dmitry Lobanov2021-05-122-0/+21
| | | | | |
| * | | | | branch: git branch upstream with format has been added.Dmitry Lobanov2021-05-121-2/+2
| | | | | |
* | | | | | Merge branch 'pr/5940'Edward Thomson2021-07-306-133/+265
|\ \ \ \ \ \
| * | | | | | status: document `GIT_STATUS_OPT_INCLUDE_UNREADABLE`Edward Thomson2021-07-302-29/+75
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Document `GIT_STATUS_OPT_INCLUDE_UNREADABLE`, and some minor cleanups.
| * | | | | | Fix struct documentation formattingpunkymaniac2021-07-064-86/+158
| | | | | | |
| * | | | | | Add missing return documentationpunkymaniac2021-07-061-0/+2
| | | | | | |
| * | | | | | Add missing empty linepunkymaniac2021-07-061-0/+1
| | | | | | |
| * | | | | | Fix documentation formatting for git_diff_filepunkymaniac2021-07-061-19/+30
| | | | | | |
| * | | | | | Fix bad char at the end of the wordpunkymaniac2021-07-061-1/+1
| | | | | | |
* | | | | | | Merge pull request #5953 from boretrk/c99-inlineEdward Thomson2021-07-301-0/+2
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | common.h: use inline when compiling for C99 and later
| * | | | | | | common.h: use inline when compiling for c99 and laterPeter Pettersson2021-07-261-0/+2
| | | | | | | |
* | | | | | | | Merge pull request #5952 from libgit2/ethomson/attrs_from_commitEdward Thomson2021-07-2924-193/+588
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Support reading attributes from a specific commit
| * | | | | | | | filter: introduce GIT_BLOB_FILTER_ATTRIBUTES_FROM_COMMITEdward Thomson2021-07-2212-5/+104
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Provide a mechanism to filter using attribute data from a specific commit (making use of `GIT_ATTR_CHECK_INCLUDE_COMMIT`).
| * | | | | | | | attr: introduce GIT_ATTR_CHECK_INCLUDE_COMMITEdward Thomson2021-07-225-17/+71
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Introduce `GIT_ATTR_CHECK_INCLUDE_COMMIT`, which like 4fd5748 allows attribute information to be read from files in the repository. 4fd5748 always reads the information from HEAD, while `GIT_ATTR_CHECK_INCLUDE_COMMIT` allows users to provide the commit to read the attributes from.