Log

Author Commit Date CI Message
Edward Thomson c40d2dc5 2020-05-15T10:09:51 thread: restore the git_thread_exit tests We were never properly testing git_thread_exit. Do so.
Edward Thomson 4853d94c 2020-05-14T10:36:35 global: separate global state from thread-local state Our "global initialization" has accumulated some debris over the years. It was previously responsible for both running the various global initializers (that set up various subsystems) _and_ setting up the "global state", which is actually the thread-local state for things like error reporting. Separate the thread local state out into "threadstate". Use the normal subsystem initialization functions that we already have to set it up. This makes both the global initialization system and the threadstate system simpler to reason about.
Edward Thomson 8aa69f88 2020-05-13T10:48:13 mwindow: localize mutex Move the mwindow mutex into the mwindow code itself, initializing it in the mwindow global initialization function instead of in the global initializer.
Edward Thomson bc3919ab 2020-07-11T12:14:26 global init: check error message buffer allocation Ensure that we can allocate the error message buffer. In keeping with our typical policiess, we allow (small) memory leaks in the case where we're out of memory.
Edward Thomson 6554b40e 2020-05-13T10:39:33 settings: localize global data Move the settings global data teardown into its own separate function, instead of intermingled with the global state.
Edward Thomson 521aa8c1 2020-05-12T13:21:26 win32: teach the allocator to deal with crtdbg Move the MSVC C runtime debugging bits into the allocator's global init function.
Edward Thomson fe12423a 2020-05-12T13:08:22 init: move thread init to git_global_threads_init Instead of treating win32 thread initialization specially in the win32 git_libgit2_init function, add a git_global_threads_init function.
Edward Thomson 2e5f27c7 2020-10-11T11:32:21 Merge pull request #5649 from libgit2/ethomson/pcre Update PCRE to 8.44
Edward Thomson 94e34582 2020-10-11T11:32:04 Merge pull request #5651 from libgit2/ethomson/clone_branch clone: update origin's HEAD
Edward Thomson 6244791a 2020-10-11T11:28:55 Merge pull request #5594 from lhchavez/git-atomics Improve the support of atomics
lhchavez 03c0938f 2020-08-25T06:13:38 Avoid using atomics in pool.c Instead, globally initialize the system page size.
lhchavez cc1d7f5c 2020-08-01T17:47:20 Improve the support of atomics This change: * Starts using GCC's and clang's `__atomic_*` intrinsics instead of the `__sync_*` ones, since the former supercede the latter (and can be safely replaced by their equivalent `__atomic_*` version with the sequentially consistent model). * Makes `git_atomic64`'s value `volatile`. Otherwise, this will make ThreadSanitizer complain. * Adds ways to load the values from atomics. As it turns out, unsynchronized read are okay only in some architectures, but if we want to be correct (and make ThreadSanitizer happy), those loads should also be performed with the atomic builtins. * Fixes two ThreadSanitizer warnings, as a proof-of-concept that this works: - Avoid directly accessing `git_refcount`'s `owner` directly, and instead makes all callers go through the `GIT_REFCOUNT_*()` macros, which also use the atomic utilities. - Makes `pool_system_page_size()` race-free. Part of: #5592
Edward Thomson 2307a225 2020-10-08T09:10:36 Merge pull request #5656 from ehuss/fix-check_extensions-err Fix error return for invalid extensions.
Eric Huss 5b7e7131 2020-10-07T15:54:08 Fix error return for invalid extensions.
Edward Thomson 9deadaee 2020-10-07T00:35:29 Merge pull request #5654 from dan-tull/master Change bare free to allocator free (fixes #5653)
Dan Tull cce966c3 2020-10-06T17:51:14 Change bare free to allocator free. The info pointer was allocated with git__malloc, so needs to be free'd with git__free. This bug can lurk pretty easily since if there's no custom allocator this is fine.
Edward Thomson c1f1bcad 2020-10-05T11:04:38 clone: update origin's HEAD Update `refs/remotes/origin/HEAD` as a symbolic link to the remote's default branch.
Edward Thomson c837bff1 2020-10-05T11:03:39 clone: test that the origin HEAD is created Ensure that we created `refs/remotes/origin/HEAD` when cloning, a symbolic link pointing to `refs/remotes/origin/<default>`
Edward Thomson d32a4072 2020-10-05T14:25:51 Merge pull request #5401 from lhchavez/multi-pack-index midx: Introduce a parser for multi-pack-index files
lhchavez 005e7715 2020-02-23T22:28:52 multipack: Introduce a parser for multi-pack-index files This change is the first in a series to add support for git's multi-pack-index. This should speed up large repositories significantly. Part of: #5399
Edward Thomson 6d1f1926 2020-10-05T09:41:08 Merge pull request #5648 from eltociear/patch-1 Fixed typo in comment
Edward Thomson 9293e165 2020-10-04T21:41:28 Merge pull request #5494 from kevinjswinton/master Fix binary diff showing /dev/null
Edward Thomson 722c01b6 2020-10-04T21:07:53 pcre: upgrade to 8.44
Edward Thomson dccfaa41 2020-10-04T20:36:22 pcre: upgrade to 8.43
Edward Thomson 600dd54e 2020-10-04T20:18:53 pcre: include the license We included their COPYING file, which was _not_ in fact their license. Add the LICENSE file as well.
kevinlul e8ab3db9 2020-07-07T22:29:05 p_chmod: Android compatibility Fix #5565 Pre-Android 5 did not implement a virtual filesystem atop FAT partitions for Unix permissions, which causes chmod to fail. However, Unix permissions have no effect on Android anyway as file permissions are not actually managed this way, so treating it as a no-op across all Android is safe.
Edward Thomson 2ab99c6d 2020-10-04T18:30:10 Merge pull request #5576 from lollipopman/double-auth httpclient: only free challenges for current_server type
Edward Thomson 3a72345b 2020-10-04T18:25:32 Merge pull request #5581 from libgit2/ethomson/mainbranch Respect `init.defaultBranch` setting
Edward Thomson a94fedc1 2020-10-04T18:04:01 Merge pull request #5620 from dlax/parse-patch-add-delete-no-index patch_parse: handle absence of "index" header for new/deleted cases
Edward Thomson a1f0135d 2020-10-04T18:01:09 Merge pull request #5626 from csware/parse_bool boolean config parsing fails in some cases with mapped values
Edward Thomson 36dc681e 2020-10-04T17:54:15 Merge pull request #5629 from csware/config-multiline-parse Fix config file parsing with multi line values containing quoted parts
Edward Thomson 30ba98a1 2020-10-04T17:40:38 Merge pull request #5636 from libgit2/pks-release-build-warnings Fix release build warnings
Ikko Ashimine 4b93f165 2020-10-04T12:45:26 Fixed typo in comment occured -> occurred
Sven Strickroth 6ac18625 2020-09-09T17:51:38 Fix config file parsing with multi line values containing quoted parts Signed-off-by: Sven Strickroth <email@cs-ware.de>
Patrick Steinhardt b254a585 2020-09-18T10:43:34 sysdir: fix formatting error message with NULL string When trying to the template dir, we pass in a `NULL` pointer for the filename. That's perfectly fine, but if we're failing to find the template directory then we'll creat an error message with the `NULL` pointer passed in. Fix the issue by setting different error messages based on whether the filename is given or not. This even makes sense, as we're not searching for a file in case we have no `name`, but for a directory. So the error would've been misleading anyway.
Patrick Steinhardt 8087498d 2020-09-18T10:49:24 Merge pull request #5631 from csware/issue-5611 Fix deprecation links inside of documentation not working
Patrick Steinhardt 37ae0079 2020-09-18T10:38:45 patch_parse: silence maybe-uninitialized warning When building libgit2 with the release build type, then GCC complains about mode being potentially uninitialized. While this seems to be a false positive, let's silence this warning by zero-initializing the mode.
Patrick Steinhardt 819492c1 2020-09-18T10:34:40 refs: fix potential free of uninitialized variable The `signature` variable in `git_reference_rename` isn't initialized and neither does `git_reference__log_signature` always do. So if the latter function fails, we'll call `git_signature_free` on this unininitialized variable. Fix the issue by initializing the pointer with `NULL`.
Patrick Steinhardt 9e81711b 2020-09-18T10:31:50 Merge pull request #5632 from csware/winhttp_typo Fix typo: Make ifndef macroname the same as the define name
Edward Thomson ae99e697 2020-09-17T11:19:49 Merge pull request #5619 from ddevault/diffstat-segfault diff stats: fix segfaults with new files
Drew DeVault ec26b16d 2020-08-29T10:44:40 diff stats: fix segfaults with new files
Edward Thomson 298b01ab 2020-09-15T09:26:08 Merge pull request #5633 from csware/winhttp1.3 WinHTTP: Try to use TLS1.3
Edward Thomson d65edcdc 2020-09-15T09:23:00 Merge pull request #5628 from interkosmos/master Fixed includes for FreeBSD
Philipp 6887e9db 2020-09-14T15:54:00 Removed FreeBSD-related macros.
Sven Strickroth 797535b6 2020-09-12T00:14:41 WinHTTP: Try to use TLS1.3 Signed-off-by: Sven Strickroth <email@cs-ware.de>
Sven Strickroth 090e7d85 2020-09-10T22:41:15 Fix deprecation links inside of documentation not working Signed-off-by: Sven Strickroth <email@cs-ware.de>
Sven Strickroth 621e501c 2020-09-10T10:32:02 Fix typo: Make ifndef macroname the same as the define name Signed-off-by: Sven Strickroth <email@cs-ware.de>
Philipp e937a2aa 2020-09-09T19:08:20 Fixed includes for FreeBSD.
Sven Strickroth c464f123 2020-09-09T15:41:12 Improve formatting Signed-off-by: Sven Strickroth <email@cs-ware.de>
Sven Strickroth b97f41db 2020-09-09T15:38:20 Add boolean tests for "on" and "off" Signed-off-by: Sven Strickroth <email@cs-ware.de>
Sven Strickroth 36cf1db2 2020-09-09T12:26:34 Support empty values for git_config_get_mapped and git_config_lookup_map_value Signed-off-by: Sven Strickroth <email@cs-ware.de>
Sven Strickroth 86d04918 2020-09-09T11:55:25 Fix parsing boolean config values when using git_config_get_mapped and git_config_lookup_map_value Signed-off-by: Sven Strickroth <email@cs-ware.de>
Edward Thomson 1e987525 2020-09-08T17:25:06 Merge pull request #5624 from csware/http-upgrade-header Don't fail if a HTTP server announces he supports a protocol upgrade
Sven Strickroth 2dea3eb4 2020-09-08T13:03:07 Don't fail if a HTTP server announces he supports a protocol upgrade cf. RFC7230 section 6.7, an Upgrade header in a normal response merely informs the client that the server supports upgrading to other protocols, and the client can ask for such an upgrade in a later request. The server requiring an upgrade is via the 426 Upgrade Required response code, not the mere presence of the Upgrade response header. (closes issue #5573) Signed-off-by: Sven Strickroth <email@cs-ware.de>
Edward Thomson f29e6dde 2020-09-01T09:58:13 Merge pull request #5621 from kim/null-safe-git_net_url_is_default_port Return false instead of segfaulting when checking for default port
Kim Altintop 7e1f0b22 2020-08-31T21:54:17 Return false instead of segfaulting when checking for default port `default_port_for_scheme` returns NULL if the scheme is not one of the builtin ones. This may cause a segmentation fault if a custom transport URL happens to contain a port number, and this code path is triggered (e.g. by setting git_fetch_options->update_fetchhead to 1).
Edward Thomson a5eb7e02 2020-08-31T12:52:48 Merge pull request #5612 from mmuman/haiku deps: ntlmclient: fix htonll for Haiku
Edward Thomson 8e3f8823 2020-08-31T12:45:11 Merge pull request #5615 from libgit2/pks/azure-remove-docjob azure: Remove job generating documentation
Denis Laxalde 74293ea0 2020-08-29T16:46:47 patch_parse: handle absence of "index" header for new/deleted cases This follows up on 11de594f85479e4804b07dc4f7b33cfe9212bea0 which added support for parsing patches without extended headers (the "index <hash>..<hash> <mode>" line); issue #5267. We now allow transition from "file mode" state to "path" state directly if there is no "index", which will happen for patches adding or deleting files as demonstrated in added test case.
Edward Thomson 931bd3b8 2020-08-28T12:30:35 Merge pull request #5617 from muhkuh-sys/master Fix crash in git_describe_commit when opts are NULL.
Christoph Thelen d10c846e 2020-08-27T21:47:48 Fix crash in git_describe_commit when opts are NULL. The argument "opts" can be NULL, which selects default options. Do not access "opts" directly but only the normalized copy.
Patrick Steinhardt 7851a165 2020-08-24T12:31:08 azure: Remove job generating documentation With the recent addition of GitHub Actions to our CI infrastructure, we now have two jobs which generate documentation: once in GHA, once in Azure. Naturally, as they both want to update the same branch, they race against each other and one of both jobs will fail. Fix this by removing the documentation job from Azure.
Patrick Steinhardt da3288de 2020-08-24T11:20:50 Merge pull request #5600 from andrewhickman/fix-double-free Fix `git_mwindow_scan_recently_used` spuriously returning true
Patrick Steinhardt 24eacab9 2020-08-24T11:00:20 Merge pull request #5599 from libgit2/ethomson/zlib zstream: handle Z_BUF_ERROR appropriately in get_output_chunk
Patrick Steinhardt 8a24ee8a 2020-08-24T10:28:02 Merge pull request #5610 from SirWindfield/patch-1 docs: fix typo
François Revol 92913621 2020-08-21T23:00:59 deps: ntlmclient: #error out on unknown platforms We explicitly pass win32 & macOS, although some old version might not have it.
François Revol 49ce5e29 2020-08-21T17:34:57 deps: ntlmclient: fix htonll for Haiku Use B_HOST_TO_BENDIAN_INT64 for that.
Sven e46ef5ee 2020-08-18T14:58:21 docs: fix typo
Andrew Hickman 04d59466 2020-08-05T22:04:15 Preserve behaviour of `git_mwindow_scan_recently_used` with `*out_window` set
Andrew Hickman 8ea9187a 2020-08-05T20:22:55 Fix `git_mwindow_scan_recently_used` spuriously returning true
Edward Thomson 4d4befac 2020-08-05T10:07:23 pack: check pack_window_open return
Edward Thomson 9bb61bad 2020-08-05T09:42:52 zstream: handle Z_BUF_ERROR appropriately in get_output_chunk Our processing loop in git_zstream_get_output_chunk does not handle `Z_BUF_ERROR` appropriately at the end of a compressed window. From the zlib manual, inflate will return: > Z_BUF_ERROR if no progress was possible or if there was not enough > room in the output buffer when Z_FINISH is used. Note that Z_BUF_ERROR > is not fatal, and inflate() can be called again with more input and > more output space to continue decompressing. In our loop, we were waiting until we got the expected size, then ensuring that we were at `Z_STREAM_END`. We are not guaranteed to be, since zlib may be in the `Z_BUF_ERROR` state where it has consumed a full window's worth of data, but it doesn't know that it's really at the end of the stream. There _could_ be more compressed data, but it doesn't _know_ that there's not until we make a subsequent call. We can change the loop to look for the end of stream instead of our expected size. This allows us to call inflate one last time when we are at the end of a window (and in the `Z_BUF_ERROR` state), allowing it to recognize the end of the stream, and move from the `Z_BUF_ERROR` state to the `Z_STREAM_END` state. If we do this, we need another exit condition: when `bytes == 0`, then no progress could be made and we should stop trying to inflate. This will be an error case, caught by the size and/or end-of-stream test.
Edward Thomson 0ff70f4a 2020-07-15T22:15:27 refs: remove "master" branch constant We don't use "master" as a hardcoded default in as many places; remove the now unused master branch constant.
Edward Thomson e3f065ea 2020-07-15T22:13:47 remote: update the default remote branch When the remote does not tell us its default, we have to guess what the default branch should be. Use our local initial branch configuration to inform the remote branch default when we clone.
Edward Thomson cd2f74d2 2020-07-15T21:29:56 clone: don't assume the default branch name We derive the branch name, even in our code, we shouldn't assume that the branch will be "master".
Edward Thomson 471ed794 2020-07-13T10:05:04 clone: respect init.defaultBranch when empty When cloning an empty repository, we need to guess what the branch structure should be; instead of hardcoding `master`, use the `init.defaultBranch` setting it if it provided.
Edward Thomson 84d2a035 2020-07-13T10:10:02 repo: teach isempty about default branch config The git_repository_isempty function now respects the init.defaultbranch setting (instead of hardcoding "master") to understand if a repository is empty or not.
Edward Thomson 4cc3b2cb 2020-07-13T10:08:23 repo: add git_repository_initialbranch Provide a helper function to get the initial branch for a repository, respecting the `init.defaultBranch` configuration option, if set, and returning the "default default" (currently `master`) otherwise.
Edward Thomson e411aae3 2020-07-13T08:47:15 repo: honor the init.defaultBranch setting As part of a push towards more inclusive language, git is reconsidering using "master" as the default branch name. As a first step, this setting will be configurable with the `init.defaultBranch` configuration option. Honor this during repository initialization. During initialization, we will create an initial branch: 1. Using the `initial_head` setting, if specified; 2. Using the `HEAD` configured in a template, if it exists; 3. Using the `init.defaultBranch` configuration option, if it is set; or 4. Using `master` in the absence of additional configuration.
Edward Thomson c71321a0 2020-08-03T11:53:03 Merge pull request #5596 from libgit2/ethomson/sanitizer_ci sanitizer ci: skip negotiate tests
Edward Thomson 6973c570 2020-08-03T11:03:19 sanitizer ci: skip negotiate tests We don't build with SPNEGO enabled on our focal-based sanitizer builds, so we need to disable the negotiate tests.
Edward Thomson 11a62973 2020-08-03T10:01:26 Merge pull request #5569 from lhchavez/ci-sanitizers Add CI support for Memory and UndefinedBehavior Sanitizers
Edward Thomson c5d41d46 2020-08-03T09:55:22 Merge pull request #5563 from pks-t/pks/worktree-heads Access HEAD via the refdb backends
Edward Thomson 52ccbc5d 2020-08-03T09:52:30 Merge pull request #5582 from libgit2/pks-config-map-optimization config_entries: Avoid excessive map operations
Patrick Steinhardt f2400a9c 2020-07-13T20:56:08 config_entries: Avoid excessive map operations 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.
Edward Thomson a83fd510 2020-07-12T21:26:59 Merge pull request #5396 from lhchavez/mwindow-file-limit mwindow: set limit on number of open files
lhchavez 92d42eb3 2020-07-12T09:53:10 Minor nits and style formatting
Patrick Steinhardt ce4cb073 2020-07-12T18:19:21 tests: verify renaming branch really updates worktree HEAD In case where a branch is getting renamed, all HEADs of the main repository and of its worktrees that point to the old branch need to get updated to point to the new branch. We already do so and have a test for this, but the test only verifies that we're able to lookup the updated HEAD, not what it contains. Let's make the test more specific by verifying the updated HEAD also has the correct updated symbolic target.
Patrick Steinhardt 5434f9a3 2020-06-17T14:57:13 refs: remove function to read HEAD directly With the last user of `git_reference__read_head` gone, let's remove it as it's been reading references without consulting the refdb backends.
Patrick Steinhardt 65895410 2020-06-17T14:56:36 repository: retrieve worktree HEAD via refdb The function `git_repository_head_for_worktree` currently uses `git_reference__read_head` to directly read a given worktree's HEAD from the filesystem. This is broken in case the repository uses a different refdb implementation than the filesystem-based one, so let's instead open the worktree as a real repository and use `git_reference_lookup`. This also fixes the case where the worktree's HEAD is not a symref, but a detached HEAD, which would have resulted in an error previously.
Patrick Steinhardt d1f210fc 2020-06-17T15:09:49 repository: remove function to iterate over HEADs The function `git_repository_foreach_head` is broken, as it directly interacts with the on-disk representation of the reference database, thus assuming that no other refdb is used for the given repository. As this is an internal function only and all users have been replaced, let's remove this function.
Patrick Steinhardt ac5fbe31 2020-06-17T14:43:27 branch: determine whether a branch is checked out via refdb We currently determine whether a branch is checked out via `git_repository_foreach_head`. As this function reads references directly from the disk, it breaks our refdb abstraction in case the repository uses a different reference backend implementation than the filesystem-based one. So let's use `git_repository_foreach_worktree` instead -- while it's less efficient, it is at least correct in all corner cases.
Patrick Steinhardt 7216b048 2020-06-17T14:23:15 refs: update HEAD references via refdb When renaming a reference, we need to iterate over every HEAD and potentially update it in case it is a symbolic reference pointing to the previous name of the renamed reference. Most importantly, this doesn't only include HEADs from the repo we're renaming the reference in, but we also need to iterate over HEADs from linked worktrees. In order to update the HEADs, we directly read them from the worktree's gitdir and thus assume that both repository and worktrees use the filesystem-based reference backend. But this breaks as soon as one got a repository with a different refdb and breaks our own abstractions. So let's instead update HEAD references via the refdb by first opening each worktree as a repository and then using the usual functions to read and update HEADs. This is a lot less efficient than the current code, but it's not like we can really help this: going via the refdb is mandatory.
Patrick Steinhardt 2fcb4f28 2020-06-17T14:09:04 repository: introduce new function to iterate over all worktrees Given a Git repository, it's non-trivial to iterate over all worktrees that are associated with it, including the "main" repository. This commit adds a new internal function `git_repository_foreach_worktree` that does this for us.
Edward Thomson 26b9e489 2020-07-12T17:04:29 Merge pull request #5570 from libgit2/pks/refdb-refactorings refdb: a set of preliminary refactorings for the reftable backend
Patrick Steinhardt 34987447 2020-06-30T10:13:26 refdb: avoid unlimited spinning in case of symref cycles To determine whether another reflog entry needs to be written for HEAD on a reference update, we need to see whether HEAD directly or indirectly points to the reference we're updating. The resolve logic is currently completely unbounded except an error occurs, which effectively means that we'd be spinning forever in case we have a symref loop in the repository refdb. Let's fix the issue by using `git_refdb_resolve` instead, which is always bounded.
Patrick Steinhardt b895547c 2020-06-30T09:35:21 refs: replace reimplementation of reference resolver The refs code currently has a second implementation that resolves references in order to find any final symbolic reference pointing to a nonexistent target branch. As we've just extended `git_refdb_resolve` to also return such references, let's use that one instead in order to reduce code duplication.
Patrick Steinhardt cf7dd05b 2020-06-30T13:26:05 refdb: return resolved symbolic refs pointing to nonexistent refs In some cases, resolving references requires us to also know about the final symbolic reference that's pointing to a nonexistent branch, e.g. in an empty repository where the main branch is yet unborn but HEAD already points to it. Right now, the resolving logic is thus split up into two, where one is the new refdb implementation and the second one is an ad-hoc implementation inside "refs.c". Let's extend `git_refdb_resolve` to also return such final dangling references pointing to nonexistent branches so we can deduplicate the resolving logic.
Patrick Steinhardt c54f40e4 2020-06-30T09:28:12 refs: move resolving of references into the refdb Resolving of symbolic references is currently implemented inside the "refs" layer. As a result, it's hard to call this function from low-level parts that only have a refdb available, but no repository, as the "refs" layer always operates on the repository-level. So let's move the function into the generic "refdb" implementation to lift this restriction.
Patrick Steinhardt ae30009e 2020-07-12T16:01:15 Merge pull request #5547 from pks-t/pks/cmake-modernization-pt2 CMake modernization pt2