summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | tests: config: verify that the global config is actually readablePatrick Steinhardt2019-03-291-0/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | While we do verify that we are able to open the global ".gitconfig" file in config::global::open_global, we never verify that we it is in fact readable. Do so by writing the global configuration file and verifying that reading from it produces the expected values.
| * | | tests: repo: verify that we can open repos with symlinked global configPatrick Steinhardt2019-03-291-0/+30
| | | | | | | | | | | | | | | | | | | | | | | | We've got reports that users are unable to open repos when their global configuration ("~/.gitconfig") is a symlink. Add a test to verify that we are in fact able to do so as expected.
| * | | tests: config: make sure to clean up after each testPatrick Steinhardt2019-03-291-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The config::global test suite creates various different directories and files which are being populated with pretend-global files. Unfortunately, the tests do not clean up after themselves, which may cause subsequent tests to fail due to cruft left behind. Fix this by always removing created directories and their contents.
* | | | Merge pull request #5035 from pks-t/pks/diff-with-space-in-filenamesEdward Thomson2019-04-043-18/+39
|\ \ \ \ | | | | | | | | | | patch_parse: fix parsing addition/deletion of file with space
| * | | | tests: diff: test parsing diffs with a new file with spaces in its pathErik Aigner2019-03-292-0/+27
| | | | | | | | | | | | | | | | | | | | | | | | | Add a test that verifies that we are able to parse patches which add a new file that has spaces in its path.
| * | | | patch_parse: fix parsing addition/deletion of file with spacePatrick Steinhardt2019-03-291-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The diff header format is a strange beast in that it is inherently unparseable in an unambiguous way. While parsing a/file.txt b/file.txt is obvious and trivially doable, parsing a diff header of a/file b/file ab.txt b/file b/file ab.txt is not (but in fact valid and created by git.git). Due to that, we have relaxed our diff header parser in commit 80226b5f6 (patch_parse: allow parsing ambiguous patch headers, 2017-09-22), so that we started to bail out when seeing diff headers with spaces in their file names. Instead, we try to use the "---" and "+++" lines, which are unambiguous. In some cases, though, we neither have a useable file name from the header nor from the "---" or "+++" lines. This is the case when we have a deletion or addition of a file with spaces: the header is unparseable and the other lines will simply show "/dev/null". This trips our parsing logic when we try to extract the prefix (the "a/" part) that is being used in the path line, where we unconditionally try to dereference a NULL pointer in such a scenario. We can fix this by simply not trying to parse the prefix in cases where we have no useable path name. That'd leave the parsed patch without either `old_prefix` or `new_prefix` populated. But in fact such cases are already handled by users of the patch object, which simply opt to use the default prefixes in that case.
| * | | | patch_parse: improve formattingPatrick Steinhardt2019-03-291-18/+12
| |/ / /
* | | | Merge pull request #5018 from romkatv/stringsEdward Thomson2019-04-042-19/+15
|\ \ \ \ | |_|_|/ |/| | | Optimize string comparisons
| * | | optimize string comparisonsromkatv2019-03-292-19/+15
| | | |
* | | | Merge pull request #5020 from implausible/fix/gitignore-negationPatrick Steinhardt2019-03-292-12/+25
|\ \ \ \ | |/ / / |/| | | Negation of subdir ignore causes other subdirs to be unignored
| * | | ignore: move tests from status to attr ignore suiteSteven King Jr2019-03-202-40/+25
| | | |
| * | | ignore: add additional test casesSteven King Jr2019-03-151-3/+5
| | | |
| * | | ignore: Do not match on prefix of negated patternsSteve King Jr2019-03-142-15/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Matching on the prefix of a negated pattern was triggering false negatives on siblings of that pattern. e.g. Given the .gitignore: dir/* !dir/sub1/sub2/** The path `dir/a.text` would not be ignored.
| * | | Implement failing test for gitignore of complex subdirectory negationTyler Ang-Wanek2019-03-141-0/+18
| |/ / | | | | | | | | | When a directory's contents are ignored, and then a glob negation is made to a nested subdir, other subdirectories are now unignored
* | | Merge pull request #5024 from stewid/xdiff-fix-typoPatrick Steinhardt2019-03-291-1/+1
|\ \ \ | | | | | | | | xdiff: fix typo
| * | | xdiff: fix typoStefan Widgren2019-03-201-1/+1
| |/ /
* | | Merge pull request #5032 from eaigner/checkout-force-safe-docfixEdward Thomson2019-03-281-2/+14
|\ \ \ | | | | | | | | docs: clarify relation of safe and forced checkout strategy
| * | | docs: clarify relation of safe and forced checkout strategyErik Aigner2019-03-251-2/+14
| | | |
* | | | Merge pull request #5026 from tenderlove/define-hash-global-init-consnstentlyEdward Thomson2019-03-243-17/+15
|\ \ \ \ | |_|/ / |/| | | Each hash implementation should define `git_hash_global_init`
| * | | Each hash implementation should define `git_hash_global_init`Aaron Patterson2019-03-223-17/+15
|/ / / | | | | | | | | | | | | | | | This means the forward declaration isn't necessary. The forward declaration can cause compilation errors as it conflicts with the `GIT_INLINE` declaration (the signatures are different).
* | | Merge pull request #5012 from dritter/dritter-patch-1Edward Thomson2019-03-061-1/+1
|\ \ \ | | | | | | | | [Doc] Update URL to git2-rs
| * | | Update URL to git2-rsDominik Ritter2019-03-051-1/+1
|/ / /
* | | Merge pull request #5008 from libgit2/ethomson/remote_completionEdward Thomson2019-03-022-3/+6
|\ \ \ | | | | | | | | remote: Rename git_remote_completion_type to _t
| * | | remote: Rename git_remote_completion_type to _tethomson/remote_completionEdward Thomson2019-02-252-3/+6
| | | | | | | | | | | | | | | | | | | | For consistency with other "type" enums, rename git_remote_completion_type to git_remote_completion_t.
* | | | Merge pull request #5005 from libgit2/ethomson/odb_backend_allocationsEdward Thomson2019-03-022-3/+58
|\ \ \ \ | | | | | | | | | | odb: provide a free function for custom backends
| * | | | odb: provide a free function for custom backendsethomson/odb_backend_allocationsEdward Thomson2019-02-232-0/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Custom backends can allocate memory when reading objects and providing them to libgit2. However, if an error occurs in the custom backend after the memory has been allocated for the custom object but before it's returned to libgit2, the custom backend has no way to free that memory and it must be leaked. Provide a free function that corresponds to the alloc function so that custom backends have an opportunity to free memory before they return an error.
| * | | | odb: rename git_odb_backend_malloc for consistencyEdward Thomson2019-02-232-3/+41
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The `git_odb_backend_malloc` name is a system function that is provided for custom ODB backends and allows them to allocate memory for an ODB object in the read callback. This is important so that libgit2 can later free the memory used by an ODB object that was read from the custom backend. However, the name _suggests_ that it actually allocates a `git_odb_backend`. It does not; rename it to make it clear that it actually allocates backend _data_.
* | | | | Revert "foo"Edward Thomson2019-02-282-186/+142
| | | | | | | | | | | | | | | | | | | | This reverts commit 1fe3fa5e59818c851d50efc6563db5f8a5d7ae9b.
* | | | | fooEdward Thomson2019-02-282-142/+186
| | | | |
* | | | | Merge branch 'threading-docs'Edward Thomson2019-02-271-26/+18
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | threading: clarify openssl default vs mbedtlsEdward Thomson2019-02-271-4/+5
| | | | |
| * | | | threading: clarify concurrency of accessEdward Thomson2019-02-271-1/+1
| | | | |
| * | | | Update threading.mdthreading-docsEtienne Samson2019-02-071-24/+15
| | | | |
* | | | | Merge pull request #5000 from augfab/branch_lookup_allEdward Thomson2019-02-252-4/+41
|\ \ \ \ \ | |_|/ / / |/| | | | Have git_branch_lookup accept GIT_BRANCH_ALL
| * | | | branch: have git_branch_lookup accept GIT_BRANCH_ALLAugustin Fabre2019-02-221-2/+16
| | | | |
| * | | | branch: add test for git_branch_lookup to accept GIT_BRANCH_ALLAugustin Fabre2019-02-221-2/+25
| | | | |
* | | | | Merge pull request #4997 from libgit2/ethomson/transfer_progressEdward Thomson2019-02-2229-107/+157
|\ \ \ \ \ | | | | | | | | | | | | Rename git_transfer_progress to git_indexer_progress
| * | | | | remote: deprecate git_push_transfer_progressethomson/transfer_progressEdward Thomson2019-02-221-0/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Safely deprecate `git_push_transfer_progress`, forwarding it to the new `git_push_transfer_progress_cb` name.
| * | | | | remote: rename git_push_transfer_progress callbackEdward Thomson2019-02-222-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The `git_push_transfer_progress` is a callback and as such should be suffixed with `_cb` for consistency. Rename `git_push_transfer_progress` to `git_push_transfer_progress_cb`.
| * | | | | indexer: deprecate git_transfer_progressEdward Thomson2019-02-222-4/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Safely deprecate `git_transfer_progress` and `git_transfer_progress_cb` types, forwarding them to the new `git_indexer_progress` and `git_indexer_progress_cb`.
| * | | | | indexer: use git_indexer_progress throughoutEdward Thomson2019-02-2227-74/+74
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update internal usage of `git_transfer_progress` to `git_indexer_progreses`.
| * | | | | indexer: rename git_transfer_progressEdward Thomson2019-02-222-30/+45
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The name `git_transfer_progress` does not reflect its true purpose. It suggests that it's progress for a non-existence `git_transfer` object, and is used for indexing callbacks more broadly than just during transfers. Rename `git_transfer_progress` to `git_indexer_progress`.
* | | | | Merge pull request #4901 from pks-t/pks/uniform-map-apiEdward Thomson2019-02-2234-861/+1122
|\ \ \ \ \ | | | | | | | | | | | | High-level map APIs
| * | | | | idxmap: remove legacy low-level interfacePatrick Steinhardt2019-02-152-71/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove the low-level interface that was exposing implementation details of `git_idxmap` to callers. From now on, only the high-level functions shall be used to retrieve or modify values of a map. Adjust remaining existing callers.
| * | | | | oidmap: remove legacy low-level interfacePatrick Steinhardt2019-02-153-257/+71
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove the low-level interface that was exposing implementation details of `git_oidmap` to callers. From now on, only the high-level functions shall be used to retrieve or modify values of a map. Adjust remaining existing callers.
| * | | | | offmap: remove legacy low-level interfacePatrick Steinhardt2019-02-152-88/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove the low-level interface that was exposing implementation details of `git_offmap` to callers. From now on, only the high-level functions shall be used to retrieve or modify values of a map. Adjust remaining existing callers.
| * | | | | strmap: remove legacy low-level interfacePatrick Steinhardt2019-02-153-153/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove the low-level interface that was exposing implementation details of `git_strmap` to callers. From now on, only the high-level functions shall be used to retrieve or modify values of a map. Adjust remaining existing callers.
| * | | | | cache: use iteration interface for cache evictionPatrick Steinhardt2019-02-151-10/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | To relieve us from memory pressure, we may regularly call `cache_evict_entries` to remove some entries from it. Unfortunately, our cache does not support a least-recently-used mode or something similar, which is why we evict entries completeley at random right now. Thing is, this is only possible due to the map interfaces exposing the entry indices, and we intend to completely remove those to decouple map users from map implementations. As soon as that is done, we are unable to do this random eviction anymore. Convert this to make use of an iterator for now. Obviously, there is no random eviction possible like that anymore, but we'll always start by evicting from the beginning of the map. Due to hashing, one may hope that the selected buckets will be evicted at least in some way unpredictably. But more likely than not, this will not be the case. But let's see what happens and if any users complain about degraded performance. If so, we might come up with a different scheme than random removal, e.g. by using an LRU cache.
| * | | | | indexer: use map iterator to delete expected OIDsPatrick Steinhardt2019-02-151-16/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | To compute whether there are objects missing in a packfile, the indexer keeps around a map of OIDs that it still expects to see. This map does not store any values at all, but in fact the keys are owned by the map itself. Right now, we free these keys by iterating over the map and freeing the key itself, which is kind of awkward as keys are expected to be constant. We can make this a bit prettier by inserting the OID as value, too. As we already store the `NULL` pointer either way, this does not increase memory usage, but makes the code a tad more clear. Furthermore, we convert the previously existing map iteration via indices to make use of an iterator, instead.
| * | | | | maps: provide high-level iteration interfacePatrick Steinhardt2019-02-158-25/+180
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently, our headers need to leak some implementation details of maps due to their direct use of indices in the implementation of their foreach macros. This makes it impossible to completely hide the map structures away, and also makes it impossible to include the khash implementation header in the C files of the respective map only. This is now being fixed by providing a high-level iteration interface `map_iterate`, which takes as inputs the map that shall be iterated over, an iterator as well as the locations where keys and values shall be put into. For simplicity's sake, the iterator is a simple `size_t` that shall initialized to `0` on the first call. All existing foreach macros are then adjusted to make use of this new function.