summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* config_entries: Avoid excessive map operationspks-config-map-optimizationPatrick Steinhardt2020-07-131-27/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When appending config entries, we currently always first get the currently existing map entry and then afterwards update the map to contain the current config value. In the common scenario where keys aren't being overridden, this is the best we can do. But in case a key gets set multiple times, then we'll also perform these two map operations. In extreme cases, hashing the map keys will thus start to dominate performance. Let's optimize the pattern by using a separately allocated map entry. Currently, we always put the current list entry into the map and update it to get any overridden multivar. As these list entries are also used to iterate config entries, we cannot update them in-place in the map and are thus forced to always set the map to contain the new entry. But with a separately allocated map entry, we can now create one once per config key and insert it into the map. Whenever appending a new config value with the same key, we can now just update the map entry in-place instead of having to replace the map entry completely. This reduces calls to the hashing function by half and trades the improved runtime for one more allocation per unique config key. Given that the refactoring arguably improves code readability by splitting concerns of the `config_entry_list` type and not having to track it in two different structures, this alone would already be reason enough to take the trade. Given a pathological case of a gitconfig with 100.000 repeated keys and a section of length 10.000 characters, this reduces runtime by half from approximately 14 seconds to 7 seconds as expected.
* Merge pull request #5547 from pks-t/pks/cmake-modernization-pt2Patrick Steinhardt2020-07-125-160/+40
|\ | | | | CMake modernization pt2
| * cmake: remove CheckPrototypeDefinition modulePatrick Steinhardt2020-07-122-125/+0
| | | | | | | | | | | | | | | | | | In the past, we've imported the CheckPrototypeDefinition into our own module directory as it wasn't yet available in all supported CMake versions. Now that we require at least CMake v3.5, we don't need to bundle it anymore as it's included with the distribution already. Let's drop the included modules and always use upstream's version.
| * cmake: use target-specific compile definitionsPatrick Steinhardt2020-07-121-7/+7
| | | | | | | | | | | | | | We set up some compile definitions as part of our src/CMakeLists.txt. While the definitions are global, we really only need them as part of the git2internal target which compiles all the objects. Let's thus use `target_compile_definitions` instead of `add_definitions`.
| * cmake: use git2internal target to populate sourcesPatrick Steinhardt2020-07-121-6/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | Modern CMake is usually target-driven in that a target is first defined and then the likes of `target_sources`, `target_include_directories` etc. are used to further populate the target. We still use old-style CMake, where we first set up a set of variables and then populate the target in a single call. Let's migrate to modern CMake usage by starting to populate the sources of our git2internal target piece-by-piece. While this is a small step, it allows us to convert to target-based build instructions piece-by-piece.
| * cmake: specify project versionPatrick Steinhardt2020-07-123-23/+22
|/ | | | | | | | | | | | | | | We currently do not set up a project version within CMake, meaning that it can't be use by other projects including libgit2 as a sub-project and also not by other tools like IDEs. This commit changes this to always set up a project version, but instead of extracting it from the "version.h" header we now set it up directly. This is mostly to avoid mis-use of the previous `LIBGIT2_VERSION` variables, as we should now always use the `libgit2_VERSION` ones that are set up by CMake if one provides the "VERSION" keyword to the `project()` call. While this is one more moving target we need to adjust on releases, this commit also adjusts our release script to verify that the project version was incremented as expected.
* Merge pull request #5568 from lhchavez/ubsanEdward Thomson2020-07-093-9/+15
|\ | | | | Make the tests run cleanly under UndefinedBehaviorSanitizer
| * Make the tests run cleanly under UndefinedBehaviorSanitizerlhchavez2020-06-303-9/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change makes the tests run cleanly under `-fsanitize=undefined,nullability` and comprises of: * Avoids some arithmetic with NULL pointers (which UBSan does not like). * Avoids an overflow in a shift, due to an uint8_t being implicitly converted to a signed 32-bit signed integer after being shifted by a 32-bit signed integer. * Avoids a unaligned read in libgit2. * Ignores unaligned reads in the SHA1 library, since it only happens on Intel processors, where it is _still_ undefined behavior, but the semantics are moderately well-understood. Of notable omission is `-fsanitize=integer`, since there are lots of warnings in zlib and the SHA1 library which probably don't make sense to fix and I could not figure out how to silence easily. libgit2 itself also has ~100s of warnings which are mostly innocuous (e.g. use of enum constants that only fit on an `uint32_t`, but there is no way to do that in a simple fashion because the data type chosen for enumerated types is implementation-defined), and investigating whether there are worrying warnings would need reducing the noise significantly.
* | Merge pull request #5567 from lhchavez/msanEdward Thomson2020-07-099-13/+21
|\ \ | | | | | | Make the tests pass cleanly with MemorySanitizer
| * | Make the tests pass cleanly with MemorySanitizerlhchavez2020-06-309-13/+21
| |/ | | | | | | | | | | | | | | | | This change: * Initializes a few variables that were being read before being initialized. * Includes https://github.com/madler/zlib/pull/393. As such, it only works reliably with `-DUSE_BUNDLED_ZLIB=ON`.
* | Merge pull request #5561 from A-Ovchinnikov-mx/a-ovchin/windres-rcEdward Thomson2020-07-092-6/+19
|\ \ | | | | | | Enable building git2.rc resource script with GCC
| * | Use __GNUC__ macro in the resource scriptAlexander Ovchinnikov2020-07-012-7/+7
| | | | | | | | | | | | Fix the default LIBGIT2_FILENAME for GNU windres
| * | Review: Rename the stringize macroAlexander Ovchinnikov2020-07-011-5/+5
| | |
| * | Enable building git2.rc resource script with GCCAlexander Ovchinnikov2020-07-012-4/+17
| |/
* | Merge pull request #5571 from lhchavez/ntlmclient-sanitizersEdward Thomson2020-07-021-11/+8
|\ \ | |/ |/| Make NTLMClient Memory and UndefinedBehavior Sanitizer-clean
| * Make NTLMClient Memory and UndefinedBehavior Sanitizer-cleanlhchavez2020-06-301-11/+8
|/ | | | | | | | | | | This change makes the code pass the libgit2 tests cleanly when MSan/UBSan are enabled. Notably: * Changes malloc/memset combos into calloc for easier auditing. * Makes `write_buf` return early if the buffer length is empty to avoid arithmetic with NULL pointers (which UBSan does not like). * Initializes a few arrays that were sometimes being read before being written to.
* Merge pull request #5559 from pks-t/pks/diff-print-fixupsEdward Thomson2020-06-231-52/+55
|\ | | | | Random fixes for diff-printing
| * diff_print: adjust code to match current coding stylePatrick Steinhardt2020-06-171-44/+32
| |
| * diff_print: return out-of-memory situation when printing binaryPatrick Steinhardt2020-06-171-0/+3
| | | | | | | | | | | | We currently don't check for out-of-memory situations on exiting `format_binary` and, as a result, may return a partially filled buffer. Fix this by checking the buffer via `git_buf_oom`.
| * diff_print: do not call abort(3P)Patrick Steinhardt2020-06-171-3/+2
| | | | | | | | | | | | | | | | | | | | Calling abort(3P) in a library is rather rude and shouldn't happen, as we effectively prohibit any corrective actions made by the application linking to it. We thus shouldn't call it at all, but instead use our new `GIT_ASSERT` macros. Remove the call to abort(3P) in case a diff delta has an unexpected type to fix this.
| * diff_print: handle errors when printing to filePatrick Steinhardt2020-06-171-5/+18
| | | | | | | | | | | | | | | | | | | | | | When printing the diff to a `FILE *` handle, we neither check the return value of fputc(3P) nor the one of fwrite(3P). As a result, we'll silently return successful even if we didn't print anything at all. Futhermore, the arguments to fwrite(3P) are reversed: we have one item of length `content_len`, and not `content_len` items of one byte. Fix both issues by checking return values as well as reversing the arguments to fwrite(3P).
* | Merge pull request #5419 from lhchavez/fix-git_index_add_from_buffer-docsPatrick Steinhardt2020-06-171-2/+1
|\ \ | |/ |/| index: Update the documentation for git_index_add_from_buffer()
| * index: Update the documentation for git_index_add_from_buffer()lhchavez2020-02-231-2/+1
| | | | | | | | | | This change makes the docs reflect reality. The id and size were never updated in the entry!
* | Merge pull request #5550 from libgit2/ethomson/github_actionsEdward Thomson2020-06-167-8/+267
|\ \ | | | | | | Introduce CI with GitHub Actions
| * | Introduce CI with GitHub Actionsethomson/github_actionsEdward Thomson2020-06-164-2/+263
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add CI using GitHub Actions and GitHub Packages: * This moves our Linux build containers into GitHub Packages; we will identify the most recent commit that updated the docker descriptions, and then look for a docker image in libgit2's GitHub Packages registry for a container with the tag corresponding to that description. If there is not one, we will build the container and then push it to GitHub Packages. * We no longer need to manage authentication with our own credentials or PAT tokens. GitHub Actions provides a GITHUB_TOKEN that can publish artifacts, packages and commits to our repository within a workflow run. * We will use a matrix to build our various CI steps. This allows us to keep configuration in a single place without multiple YAML files.
| * | docker: don't take BASE as an argumentEdward Thomson2020-06-112-4/+2
| | | | | | | | | | | | | | | | | | The xenial image depends on ubuntu:xenial; the bionic one on ubuntu:bionic. No need for this to be a variable, that's just additional (unnecessary) state to manage in the CI setup(s).
| * | azure pipelines: use bundled zlibEdward Thomson2020-06-101-2/+2
| | | | | | | | | | | | | | | | | | Azure Pipelines has a version of zlib hanging out on the filesystem; avoid trying to use it as it's either 64 _or_ 32 bit, so exactly one of our builds will fail.
* | | Merge pull request #5552 from libgit2/pks/small-fixesEdward Thomson2020-06-133-63/+17
|\ \ \ | | | | | | | | Random code cleanups and fixes
| * | | checkout: remove unused code for deferred removalspks/small-fixesPatrick Steinhardt2020-06-081-53/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | With commit 05f690122 (checkout: remove blocking dir when FORCEd, 2015-03-31), the last case was removde that actually queued a deferred removal. This is now more than five years in the past and nobody complained, so we can rest quite assured that the deferred removal is not really needed at all. Let's remove all related code to simplify the already complicated checkout logic.
| * | | tests: refs: modernize coding style of testcasePatrick Steinhardt2020-06-081-8/+3
| | | | | | | | | | | | | | | | | | | | The coding style of the testcase refs::create::propagate_eexists is not really up-to-date. Convert it to use a more modern coding style.
| * | | revparse: remove superfluous tab characterPatrick Steinhardt2020-06-081-1/+1
| | | |
| * | | revparse: detect out-of-memory cases when parsing curly brace contentsPatrick Steinhardt2020-06-081-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When extracting curly braces (e.g. the "upstream" part in "HEAD@{upstream}"), we put the curly braces' contents into a `git_buf` structure, but don't check the return value of `git_buf_putc`. So when we run out-of-memory, we'll use a partially filled buffer without noticing. Let's fix this issue by checking `git_buf_putc`'s return value.
* | | | Merge pull request #5553 from pks-t/pks/example-log-docfixEdward Thomson2020-06-121-9/+18
|\ \ \ \ | |_|/ / |/| | | examples: log: fix documentation generation
| * | | examples: log: fix documentation generationPatrick Steinhardt2020-06-081-9/+18
| |/ / | | | | | | | | | | | | | | | Docurium seems to be confused by our use of `/** comment */;` use in the log example. Let's just switch it around to help Docurium get this right.
* | | Merge pull request #5551 from pks-t/pks/missing-declarationsPatrick Steinhardt2020-06-1052-124/+148
|\ \ \ | | | | | | | | Missing declarations
| * | | cmake: enable warnings for missing function declarationsPatrick Steinhardt2020-06-091-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Over time, we have accumulated quite a lot of functions with missing prototypes, missing `static` keywords or which were completely unused. It's easy to miss these mistakes, but luckily GCC and Clang both have the `-Wmissing-declarations` warning. Enabling this will cause them to emit warnings for every not-static function that doesn't have a previous declaration. This is a very sane thing to enable, and with the preceding commits all these new warnings have been fixed. So let's always enable this warning so we won't introduce new instances of them.
| * | | refs: add missing function declarationPatrick Steinhardt2020-06-091-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | The function `git_reference__is_note` is not declared anywhere. Let's add the declaration to avoid having non-static functions without declaration.
| * | | tree-wide: do not compile deprecated functions with hard deprecationPatrick Steinhardt2020-06-0931-6/+79
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When compiling libgit2 with -DDEPRECATE_HARD, we add a preprocessor definition `GIT_DEPRECATE_HARD` which causes the "git2/deprecated.h" header to be empty. As a result, no function declarations are made available to callers, but the implementations are still available to link against. This has the problem that function declarations also aren't visible to the implementations, meaning that the symbol's visibility will not be set up correctly. As a result, the resulting library may not expose those deprecated symbols at all on some platforms and thus cause linking errors. Fix the issue by conditionally compiling deprecated functions, only. While it becomes impossible to link against such a library in case one uses deprecated functions, distributors of libgit2 aren't expected to pass -DDEPRECATE_HARD anyway. Instead, users of libgit2 should manually define GIT_DEPRECATE_HARD to hide deprecated functions. Using "real" hard deprecation still makes sense in the context of CI to test we don't use deprecated symbols ourselves and in case a dependant uses libgit2 in a vendored way and knows it won't ever use any of the deprecated symbols anyway.
| * | | tree-wide: add missing header includesPatrick Steinhardt2020-06-093-4/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | We're missing some header includes leading to missing function prototypes. While we currently don't warn about these, we should have their respective headers included in order to detect the case where a function signature change results in an incompatibility.
| * | | tree-wide: mark local functions as staticPatrick Steinhardt2020-06-0920-61/+59
| | | | | | | | | | | | | | | | | | | | | | | | | | | | We've accumulated quite some functions which are never used outside of their respective code unit, but which are lacking the `static` keyword. Add it to reduce their linkage scope and allow the compiler to optimize better.
| * | | tree-wide: remove unused functionsPatrick Steinhardt2020-06-084-53/+0
|/ / / | | | | | | | | | | | | We have some functions which aren't used anywhere. Let's remove them to get rid of unneeded baggage.
* | | Revert .github/workflows/main.ymlEdward Thomson2020-06-071-111/+0
| | |
* | | yoEdward Thomson2020-06-072-10/+2
| | |
* | | Update main.ymlEdward Thomson2020-06-071-1/+1
| | |
* | | Update main.ymlEdward Thomson2020-06-071-36/+36
| | |
* | | Update main.ymlEdward Thomson2020-06-071-3/+1
| | |
* | | Update main.ymlEdward Thomson2020-06-071-1/+1
| | |
* | | Update main.ymlEdward Thomson2020-06-071-1/+1
| | |
* | | Update main.ymlEdward Thomson2020-06-071-1/+1
| | |
* | | Update bionicEdward Thomson2020-06-071-0/+1
| | |