summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* cmake: extended futimens checking on macOSethomson/futimensEdward Thomson2021-07-303-1/+16
|
* 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.
| * | | | attr: cache nonexistent attr files from commitsEdward Thomson2021-07-221-3/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When looking up an attribute file in a commit, we can cache a nonexistent attribute file indefinitely (since a commit could not somehow later contain an attribute file). Cache an empty buffer when an attribute file does not exist in a given commit.
| * | | | filter: add git_filter_optionsEdward Thomson2021-07-223-15/+70
| | | | | | | | | | | | | | | | | | | | | | | | | Allow filter users to provide an options structure instead of simply flags. This allows for future growth for filter options.
| * | | | filter: filter options are now "filter sessions"Edward Thomson2021-07-223-26/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Filters use a short-lived structure to keep state during an operation to allow for caching and avoid unnecessary reallocations. This was previously called the "filter options", despite the fact that they contain no configurable options. Rename them to a "filter session" in keeping with an "attribute session", which more accurately describes their use (and allows us to create "filter options" in the future).
| * | | | attr: introduce `git_attr_options` for extended queriesEdward Thomson2021-07-225-20/+146
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow more advanced attribute queries using a `git_attr_options`, and extended functions to use it. Presently there is no additional configuration in a `git_attr_options` beyond the flags, but this is for future growth.
| * | | | attr: include the filename in the attr sourceEdward Thomson2021-07-226-78/+104
| | | | | | | | | | | | | | | | | | | | The attribute source object is now the type and the path.
| * | | | attr: the attr source is now a structEdward Thomson2021-07-224-19/+26
| | | | | | | | | | | | | | | | | | | | | | | | | We may want to extend the attribute source; use a structure instead of an enum.
| * | | | attr: rename internal attr file source enumEdward Thomson2021-07-228-77/+89
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The enum `git_attr_file_source` is better suffixed with a `_t` since it's a type-of source. Similarly, its members should have a matching name.
* | | | | Merge pull request #5954 from Crayon2000/patch-1Edward Thomson2021-07-281-1/+1
|\ \ \ \ \
| * | | | | Fix typo in general.cCrayon2021-07-281-1/+1
|/ / / / /
* | | | | Merge pull request #5767 from lhchavez/cgraph-reachable-from-anyEdward Thomson2021-07-275-20/+340
|\ \ \ \ \
| * | | | | Swap the order of the `git_graph_reachable_from_any` paramslhchavez2021-07-273-11/+11
| | | | | | | | | | | | | | | | | | | | | | | | len, array -> array, len
| * | | | | graph: Create `git_graph_reachable_from_any()`lhchavez2021-07-275-20/+340
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change introduces a new API function `git_graph_reachable_from_any()`, that answers the question whether a commit is reachable from any of the provided commits through following parent edges. This function can take advantage of optimizations provided by the existence of a `commit-graph` file, since it makes it faster to know whether, given two commits X and Y, X cannot possibly be an reachable from Y. Part of: #5757
* | | | | Merge pull request #5766 from lhchavez/cgraph-generation-cmpEdward Thomson2021-07-274-2/+21
|\ \ \ \ \ | | | | | | | | | | | | commit-graph: Introduce `git_commit_list_generation_cmp`
| * | | | | commit-graph: Introduce `git_commit_list_generation_cmp`lhchavez2021-07-264-2/+21
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change makes calculations of merge-bases a bit faster when there are complex graphs and the commit times cause visiting nodes multiple times. This is done by visiting the nodes in the graph in reverse generation order when the generation number is available instead of commit timestamp. If the generation number is missing in any pair of commits, it can safely fall back to the old heuristic with no negative side-effects. Part of: #5757
* | | | | Merge pull request #5765 from lhchavez/cgraph-revwalksEdward Thomson2021-07-2611-111/+376
|\ \ \ \ \ | |_|/ / / |/| | | | commit-graph: Use the commit-graph in revwalks
| * | | | commit-graph: Create `git_commit_graph` as an abstraction for the filelhchavez2021-03-1010-181/+332
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change does a medium-size refactor of the git_commit_graph_file and the interaction with the ODB. Now instead of the ODB owning a direct reference to the git_commit_graph_file, there will be an intermediate git_commit_graph. The main advantage of that is that now end users can explicitly set a git_commit_graph that is eagerly checked for errors, while still being able to lazily use the commit-graph in a regular ODB, if the file is present.
| * | | | commit-graph: Use the commit-graph in revwalkslhchavez2021-03-104-2/+116
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change makes revwalks a bit faster by using the `commit-graph` file (if present). This is thanks to the `commit-graph` allow much faster parsing of the commit information by requiring near-zero I/O (aside from reading a few dozen bytes off of a `mmap(2)`-ed file) for each commit, instead of having to read the ODB, inflate the commit, and parse it. This is done by modifying `git_commit_list_parse()` and letting it use the ODB-owned commit-graph file. Part of: #5757
* | | | | Merge pull request #5890 from lolgear/git_submodule_dupEdward Thomson2021-07-223-0/+60
|\ \ \ \ \ | | | | | | | | | | | | [Submodule] Git submodule dup
| * | | | | tests: submodule git lookup can be dupped test comments have been changed.Dmitry Lobanov2021-06-151-3/+3
| | | | | |
| * | | | | submodule: git submodule dup out and source parameters have become mandatory.Dmitry Lobanov2021-06-152-3/+3
| | | | | |
| * | | | | tests: submodule git lookup can be dupped test has been added.Dmitry Lobanov2021-06-031-0/+40
| | | | | |
| * | | | | submodule: git submodule dup documentation has been fixed.Dmitry Lobanov2021-06-011-2/+2
| | | | | |
| * | | | | submodule: git submodule dup implementation has been reverted. Assert has ↵Dmitry Lobanov2021-05-261-1/+7
| | | | | | | | | | | | | | | | | | | | | | | | been added.