summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* diff::parse: don't include `diff.h`ethomson/diff_parseEdward Thomson2020-06-051-1/+0
| | | | | We don't call any internal functions in the test; we don't need to include `../src/diff.h`.
* Merge pull request #5543 from libgit2/ethomson/release_script_typoPatrick Steinhardt2020-06-041-1/+1
|\ | | | | release script: fix typo
| * release script: fix typoethomson/release_script_typoEdward Thomson2020-06-041-1/+1
|/
* Merge pull request #5537 from libgit2/ethomson/clar_exactmatchPatrick Steinhardt2020-06-031-0/+9
|\ | | | | tests: offer exact name matching with a `$` suffix
| * offer exact name matching with a `$` suffixethomson/clar_exactmatchEdward Thomson2020-06-021-0/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When using `-s` to specify a particular test, it will do a prefix match. Thus, `-sapply::both::rename_a_to_b_to_c` will match both a test named `test_apply_both__rename_a_to_b_to_c` and a test that begins with that name, like `test_apply_both__rename_a_to_b_to_c_exact`. Permit a trailing `$` to `-s` syntax. This allows a user to specify `-sapply::both::rename_a_to_b_to_c$` to match _only_ the `test_apply_both__rename_a_to_b_to_c` function. We already filter to ensure that the given prefix matches the current test name. Also ensure that the length of the test name matches the length of the filter, sans trailing `$`.
* | Merge pull request #5536 from libgit2/ethomson/httpPatrick Steinhardt2020-06-032-4/+24
|\ \ | | | | | | httpclient: support googlesource
| * | httpclient: clear the read_buf on new requestsethomson/httpEdward Thomson2020-06-021-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The httpclient implementation keeps a `read_buf` that holds the data in the body of the response after the headers have been written. We store that data for subsequent calls to `git_http_client_read_body`. If we want to stop reading body data and send another request, we need to clear that cached data. Clear the cached body data on new requests, just like we read any outstanding data from the socket.
| * | httpclient: don't read more than the client wantsEdward Thomson2020-06-011-0/+4
| | | | | | | | | | | | | | | | | | | | | When `git_http_client_read_body` is invoked, it provides the size of the buffer that can be read into. This will be set as the parser context's `output_size` member. Use this as an upper limit on our reads, and ensure that we do not read more than the client requests.
| * | httpclient: read_body should return 0 at EOFEdward Thomson2020-06-011-3/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When users call `git_http_client_read_body`, it should return 0 at the end of a message. When the `on_message_complete` callback is called, this will set `client->state` to `DONE`. In our read loop, we look for this condition and exit. Without this, when there is no data left except the end of message chunk (`0\r\n`) in the http stream, we would block by reading the three bytes off the stream but not making progress in any `on_body` callbacks. Listening to the `on_message_complete` callback allows us to stop trying to read from the socket when we've read the end of message chunk.
| * | online::clone: test a googlesource URLEdward Thomson2020-06-011-0/+8
| | | | | | | | | | | | | | | Google Git (googlesource.com) behaves differently than git proper. Test that we can communicate with it.
* | | Merge pull request #5532 from joshtriplett/pack-default-pathEdward Thomson2020-06-023-11/+31
|\ \ \ | | | | | | | | git_packbuilder_write: Allow setting path to NULL to use the default path
| * | | git_packbuilder_write: Allow setting path to NULL to use the default pathJosh Triplett2020-05-233-1/+20
| | | | | | | | | | | | | | | | | | | | | | | | If given a NULL path, write to the object path of the repository. Add tests for the new behavior.
| * | | git_packbuilder_write: Unify cleanup pathJosh Triplett2020-05-231-10/+11
| | | | | | | | | | | | | | | | | | | | | | | | Clean up and return via a single label, to avoid duplicate error handling before each return, and to make it easier to extend the set of cleanups needed.
* | | | Merge pull request #5531 from joshtriplett/mempack-threadsEdward Thomson2020-06-021-0/+2
|\ \ \ \ | |_|_|/ |/| | | mempack: Use threads when building the pack
| * | | mempack: Use threads when building the packJosh Triplett2020-05-231-0/+2
| |/ / | | | | | | | | | | | | | | | The mempack ODB backend creates a packbuilder internally to write out a pack; call git_packbuilder_set_threads on that packbuilder, to use threads for packing if available.
* | | Merge pull request #5528 from libgit2/ethomson/clar_internalEdward Thomson2020-06-021-44/+191
|\ \ \ | | | | | | | | clar: use internal functions instead of /bin/cp and /bin/rm
| * | | clar: remove unused shell_out functionethomson/clar_internalEdward Thomson2020-06-021-26/+0
| | | |
| * | | clar: remove files internally instead of /bin/rmEdward Thomson2020-06-021-10/+37
| | | | | | | | | | | | | | | | | | | | | | | | Similar to how clar has used `/bin/cp` to copy files, it's used `/bin/rm` to remove them. This has similar deficiencies; meaning that leaks is noisy and it's slow. Move it to an internal function.
| * | | clar: copy files with sendfile on linuxEdward Thomson2020-06-021-6/+27
| | | |
| * | | clar: copy files internally instead of /bin/cpEdward Thomson2020-06-021-18/+143
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | clar has historically shelled out to `/bin/cp` to copy test fixtures into a sandbox. This has two deficiencies: 1. It's slower than simply opening the source and destination and copying them in a read/write loop. On my Mac, the `/bin/cp` based approach takes ~2:40 for a full test pass. Using a read/write loop to copy the files ourselves takes ~1:50. 2. It's noisy. Since the leak detector follows fork/exec, we'll end up running the leak detector on `/bin/cp`. This would be fine, except that the leak detector spams the console on startup and shutdown, so it adds a _lot_ of additional information to the test runs that is useless. By not forking and using this internal system, we see much less output.
* | | Merge pull request #5535 from libgit2/ethomson/strarrayEdward Thomson2020-06-0228-132/+179
|\ \ \ | |_|/ |/| | strarray refactoring
| * | strarray: deprecate git_strarray_copyEdward Thomson2020-06-011-0/+12
| | | | | | | | | | | | | | | | | | We should not be in the business of copying strings around for users. We either return a strarray that can be freed, or we take one (and do not mutate it).
| * | strarray: we should `dispose` instead of `free`Edward Thomson2020-06-0127-88/+113
| | | | | | | | | | | | | | | | | | We _dispose_ the contents of objects; we _free_ objects (and their contents). Update `git_strarray_free` to be `git_strarray_dispose`. `git_strarray_free` remains as a deprecated proxy function.
| * | strarray: move to its own fileEdward Thomson2020-06-012-46/+56
|/ /
* | Merge pull request #5481 from pks-t/pks/cmake-cleanupsPatrick Steinhardt2020-06-0122-58/+20
|\ \ | | | | | | CMake cleanups
| * | cmake: always disable deprecation-sync warningsPatrick Steinhardt2020-06-011-20/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We currently disable deprecation synchronization warnings in case we're building with Clang. We check for Clang by doing a string comparison on the compiler identification, but this seems to have been broken by an update in macOS' image as the compiler ID has changed to "AppleClang". Let's just unconditionally disable this warning on Unix platforms. We never add the deprecated attribute anyway, so the warning doesn't help us at all.
| * | cmake: remove policiesPatrick Steinhardt2020-06-011-11/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The `CMAKE_MINIUM_REQUIRE()` function not only sets up the minimum required CMake version of a project, but it will also at the same time set the CMake policy version. In effect this means that all policies that have been introduced before the minimum CMake version will be enabled automatically. When updating our minimum required version ebabb88f2 (cmake: update minimum CMake version to v3.5.1, 2019-10-10), we didn't remove any of the policies we've been manually enabling. The newest CMake policy we've been enabling is CMP0054, which was introduced back in CMake v3.1. As a result, we can now just remove all manual calls to `CMAKE_POLICY()`.
| * | cmake: remove option to add profiling flagsPatrick Steinhardt2020-06-011-6/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | We currently have an option that adds options for profiling to both our CFLAGS and LDFLAGS. Having such flags behind various build options is not really sensible at all, since users should instead set up those flags via environment variables supported by CMake itself. Let's remove this option.
| * | cmake: remove support for creating tagsPatrick Steinhardt2020-06-011-20/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We currently have support for generating tags via ctags as part of our build system. We aren't really in the place of supporting any tooling that exists apart from the actual build environment, as doing so adds additional complexity and maintenance burden to our build instructions. This is in fact nicely demonstrated by this particular option, as it hasn't been working anymore since commit e5c9723d0 (cmake: move library build instructions into subdirectory, 2017-06-30). As a result, this commit removes support for building CTags
| * | cmake: move modules into the "cmake/" top level dirPatrick Steinhardt2020-06-0122-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Our custom CMake module currently live in "cmake/Modules". As the "cmake/" directory doesn't contain anything except the "Modules" directory, it doesn't really make sense to have the additional intermediate directory. So let's instead move the modules one level up into the "cmake/" top level directory.
* | | Merge pull request #5526 from libgit2/ethomson/poolinitPatrick Steinhardt2020-06-0118-52/+56
|\ \ \ | |/ / |/| | git_pool_init: allow the function to fail
| * | git_pool_init: handle failure casesethomson/poolinitEdward Thomson2020-06-0116-49/+49
| | | | | | | | | | | | Propagate failures caused by pool initialization errors.
| * | git_pool_init: return an intEdward Thomson2020-05-232-3/+7
| | | | | | | | | | | | Let `git_pool_init` return an int so that it could fail.
* | | Merge pull request #5529 from libgit2/ethomson/difftestPatrick Steinhardt2020-06-011-3/+3
|\ \ \ | | | | | | | | diff::workdir: actually test the buffers
| * | | diff::workdir: actually test the buffersethomson/difftestEdward Thomson2020-05-231-3/+3
| | |/ | |/| | | | | | | | | | | | | The static test data is erroneously initialized with a length of 0 for three of the strings. This means the tests are not actually examining those strings. Provide the length.
* | | Merge pull request #5527 from libgit2/ethomson/config_unreadablePatrick Steinhardt2020-06-012-0/+26
|\ \ \ | | | | | | | | Handle unreadable configuration files
| * | | config: test that unreadable files are treated as notfoundEdward Thomson2020-06-011-0/+17
| | | |
| * | | config: ignore unreadable configuration filesWil Shipley2020-06-011-0/+9
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Modified `config_file_open()` so it returns 0 if the config file is not readable, which happens on global config files under macOS sandboxing (note that for some reason `access(F_OK)` DOES work with sandboxing, but it is lying). Without this read check sandboxed applications on macOS can not open any repository, because `config_file_read()` will return GIT_ERROR when it cannot read the global /Users/username/.gitconfig file, and the upper layers will just completely abort on GIT_ERROR when attempting to load the global config file, so no repositories can be opened.
* | | Merge pull request #5533 from pjw91/fix-index-writePatrick Steinhardt2020-06-012-3/+6
|\ \ \ | |/ / |/| | Make git_index_write() generate valid v4 index
| * | tests: index::version: write v4 index: re-open repo to read written v4 indexPatrick Wang2020-05-271-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | The `git_index_free()` merely decrement the reference counter from 2 to 1, and does not "free" the index. Thus, the following `git_repository_index()` merely increase the counter to 2, instead of read index from disk. The written index is not read and parsed, which makes this test case effectively becomes a no-op.
| * | index: write v4: bugfix: prefix path with strip_len, not same_lenPatrick Wang2020-05-261-2/+2
|/ / | | | | | | | | According to index-format.txt of git, the path of an entry is prefixed with N, where N indicates the length of bytes to be stripped.
* | Merge pull request #5522 from pks-t/pks/openssl-cert-memleakEdward Thomson2020-05-231-6/+12
|\ \ | |/ |/| OpenSSL certificate memory leak
| * streams: openssl: fix memleak due to us not free'ing certsPatrick Steinhardt2020-05-151-6/+12
| | | | | | | | | | | | | | | | | | When creating a `git_cert` from the OpenSSL X509 certificate of a given stream, we do not call `X509_free()` on the certificate, leading to a memory leak as soon as the certificate is requested e.g. by the certificate check callback. Fix the issue by properly calling `X509_free()`.
* | Merge pull request #5515 from pks-t/pks/flaky-checkout-testEdward Thomson2020-05-232-22/+19
|\ \ | | | | | | tests: checkout: fix flaky test due to mtime race
| * | checkout::index: free the indexEdward Thomson2020-05-231-0/+2
| | |
| * | checkout: fix file being treated as unmodified due to racy indexPatrick Steinhardt2020-05-161-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When trying to determine whether a file changed, we try to avoid heavy operations by fist taking a look at the index, seeing whether the index entry is modified already. This doesn't seem to cut it, though, as we currently have the racy checkout::index::can_disable_pathspec_match test case: sometimes the files get restored to their original contents, sometimes they aren't. The issue is caused by a racy index [1]: in case we modify a file, add it to the index and then modify it again in-place without changing its file, then we may end up with a modified file that has the same stat(3P) info as we've currently got it in its corresponding index entry. The mitigation for this is to treat files with the same mtime as the index are treated as racily modified. We already have this logic in place for the index, but not when doing a checkout. Fix the issue by only consulting the index entry in case it has an older mtime as the index. Previously, the following script reliably had at least 20 failures, while now there is no failure to be observed anymore: ```bash j=0 for i in $(seq 100) do if ! ./libgit2_clar -scheckout::index::can_disable_pathspec_match >/dev/null then j=$(($j + 1)) fi done echo "Failures: $j" ``` [1]: https://git-scm.com/docs/racy-git
| * | tests: checkout: fix stylistic issues and static variablePatrick Steinhardt2020-05-161-19/+13
| | | | | | | | | | | | | | | | | | | | | | | | The test case checkout::index::can_disable_pathspec_match has some shortcomings when it comes to coding style, which didn't fit our own coding style. Furthermore, it had an unnecessary static local variable. The test has been refactored to address these issues.
* | | Merge pull request #5523 from libgit2/pks/cmake-sort-reproducible-buildsEdward Thomson2020-05-235-25/+36
|\ \ \ | |/ / |/| | cmake: Sort source files for reproducible builds
| * | cmake: Sort source files for reproducible buildspks/cmake-sort-reproducible-buildsPatrick Steinhardt2020-05-155-25/+36
| |/ | | | | | | | | | | | | | | | | | | | | We currently use `FILE(GLOB ...)` in most places to find source and header files. This is problematic in that the order of files returned depends on the operating system's directory iteration order and may thus not be deterministic. As a result, we link object files in unspecified order, which may cause the linker to emit different code across runs. Fix this issue by sorting all code used as input to the libgit2 library to improve the reliability of reproducible builds.
* | Merge pull request #5517 from libgit2/pks/futils-symlink-argsEdward Thomson2020-05-122-6/+6
|\ \ | | | | | | futils: fix order of declared parameters for `git_futils_fake_symlink`