summaryrefslogtreecommitdiff
path: root/include/git2
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | Clean up newly introduced warningsRussell Belfer2013-09-231-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The attempt to "clean up warnings" seems to have introduced some new warnings on compliant compilers. This fixes those in a way that I suspect will also be okay for the non-compliant compilers. Also this fixes what appears to be an extra semicolon in the repo initialization template dir handling (and as part of that fix, handles the case where an error occurs correctly).
* | | | 'del' instead of 'delete' for the poor C++ usersEdward Thomson2013-09-241-1/+1
|/ / /
* | | Merge pull request #1863 from linquize/typoVicent Martí2013-09-221-1/+1
|\ \ \ | | | | | | | | Fix typo in documentation
| * | | Fix typo in documentationLinquize2013-09-221-1/+1
| | | |
* | | | merge: reverse array and length parameter orderCarlos Martín Nieto2013-09-221-3/+3
|/ / / | | | | | | | | | Make it pair up with the one for commits. This fixes #1691.
* | | Merge pull request #1840 from linquize/warningVicent Martí2013-09-211-1/+1
|\ \ \ | | | | | | | | Fix warning
| * | | Fix warningLinquize2013-09-191-1/+1
| | | |
* | | | Merge pull request #1858 from linquize/win32-template-dirVicent Martí2013-09-171-1/+15
|\ \ \ \ | | | | | | | | | | Configurable template dir for Win32
| * | | | Can git_libgit2_opts() with GIT_OPT_GET_TEMPLATE_PATH and ↵Linquize2013-09-181-1/+15
| | | | | | | | | | | | | | | | | | | | GIT_OPT_SET_TEMPLATE_PATH
* | | | | Bug fixes and cleanupsRussell Belfer2013-09-171-33/+68
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This contains a few bug fixes and some header and API cleanups. The main API change is that filters should now use GIT_PASSTHROUGH to indicate that they wish to skip processing a file instead of GIT_ENOTFOUND. The bug fixes include a possible out-of-range buffer access in the ident filter, a filter ordering problem I introduced into the custom filter tests on Windows, and a filter buf NUL termination issue that was coming up on Linux.
* | | | | More filtering tests including orderRussell Belfer2013-09-171-0/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This adds more tests of filters, including the ident filter when mixed with custom filters. I was able to combine with the reverse filter and demonstrate that the order of filter application with the default priority constants matches the order of core Git. Also, this fixes two issues in the ident filter: preventing ident expansion on binary files and avoiding a NULL dereference when dollar sign characters are found without Id.
* | | | | Port tests from PR 1683Russell Belfer2013-09-172-0/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This ports over some of the tests from https://github.com/libgit2/libgit2/pull/1683 by @yorah and @ethomson
* | | | | Merge git_buf and git_bufferRussell Belfer2013-09-174-68/+79
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This makes the git_buf struct that was used internally into an externally available structure and eliminates the git_buffer. As part of that, some of the special cases that arose with the externally used git_buffer were blended into the git_buf, such as being careful about git_buf objects that may have a NULL ptr and allowing for bufs with a valid ptr and size but zero asize as a way of referring to externally owned data.
* | | | | Add ident filterRussell Belfer2013-09-172-4/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This adds the ident filter (that knows how to replace $Id$) and tweaks the filter APIs and code so that git_filter_source objects actually have the updated OID of the object being filtered when it is a known value.
* | | | | Add functions to manipulate filter listsRussell Belfer2013-09-172-17/+37
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Extend the git2/sys/filter API with functions to look up a filter and add it manually to a filter list. This requires some trickery because the regular attribute lookups and checks are bypassed when this happens, but in the right hands, it will allow a user to have granular control over applying filters.
* | | | | Hook up filter initialize callbackRussell Belfer2013-09-171-0/+2
| | | | | | | | | | | | | | | | | | | | I knew I forgot something
* | | | | Extend public filter api with filter listsRussell Belfer2013-09-173-22/+119
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This moves the git_filter_list into the public API so that users can create, apply, and dispose of filter lists. This allows more granular application of filters to user data outside of libgit2 internals. This also converts all the internal usage of filters to the public APIs along with a few small tweaks to make it easier to use the public git_buffer stuff alongside the internal git_buf.
* | | | | Add attributes to filters and fix registryRussell Belfer2013-09-172-18/+84
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The filter registry as implemented was too primitive to actually work once multiple filters were coming into play. This expands the implementation of the registry to handle multiple prioritized filters correctly. Additionally, this adds an "attributes" field to a filter that makes it really really easy to implement filters that are based on one or more attribute values. The lookup and even simple value checking can all happen automatically without custom filter code. Lastly, with the registry improvements, this fills out the filter lifecycle callbacks, with initialize and shutdown callbacks that will be called before the filter is first used and after it is last invoked. This allows for system-wide initialization and cleanup by the filter.
* | | | | Make git_filter_source opaqueRussell Belfer2013-09-171-6/+23
| | | | |
* | | | | Create public filter object and use itRussell Belfer2013-09-172-1/+119
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This creates include/sys/filter.h with a basic definition of a git_filter and then converts the internal code to use it. There are related internal objects (git_filter_list) that we will want to publish at some point, but this is a first step.
* | | | | Start of filter API + git_blob_filtered_contentRussell Belfer2013-09-173-0/+172
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This begins the process of exposing git_filter objects to the public API. This includes: * new public type and API for `git_buffer` through which an allocated buffer can be passed to the user * new API `git_blob_filtered_content` * make the git_filter type and GIT_FILTER_TO_... constants public
* | | | Merge pull request #1856 from libgit2/cmn/no-orphansVicent Martí2013-09-173-8/+8
|\ \ \ \ | | | | | | | | | | No such thing as an orphan branch
| * | | | No such thing as an orphan branchCarlos Martín Nieto2013-09-173-8/+8
| | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Unfortunately git-core uses the term "unborn branch" and "orphan branch" interchangeably. However, "orphan" is only really there for the checkout command, which has the `--orphan` option so it doesn't actually create the branch. Branches never have parents, so the distinction of a branch with no parents is odd to begin with. Crucially, the error messages deal with unborn branches, so let's use that.
* | | | Add a wrapper to provide the libssh2 error messageEtienne Samson2013-09-161-0/+1
|/ / /
* | | git_clone supports optional init_optionsLinquize2013-09-161-0/+1
| | |
* | | Merge pull request #1838 from libgit2/cmn/first-parentRussell Belfer2013-09-101-0/+8
|\ \ \ | | | | | | | | revwalk: allow simplifying by first-parent
| * | | revwalk: allow simplifying by first-parentCarlos Martín Nieto2013-09-091-0/+8
| |/ / | | | | | | | | | | | | When enabled, only the first parent of each commit will be queued, enabling a simple way of using first-parent simplification.
* | | fixing headers with bad values for objective-cJohn Josef2013-09-092-3/+3
| | |
* | | Merge pull request #1842 from uh-sem-blee/developmentRussell Belfer2013-09-091-5/+5
|\ \ \ | | | | | | | | fixes issues with objective-git
| * | | fixes issues with objective-gitJohn Josef2013-09-081-5/+5
| |/ /
* | | Comment updatesRussell Belfer2013-09-092-12/+13
| | |
* | | odb: Error when streaming in too [few|many] bytesnulltoken2013-09-072-3/+16
|/ /
* | odb: Prevent stream_finalize_write() from overwritingnulltoken2013-09-061-0/+4
| | | | | | | | | | | | Now that #1785 is merged, git_odb_stream_finalize_write() calculates the object id before invoking the odb backend. This commit gives a chance to the backend to check if it already knows this object.
* | Merge pull request #1817 from libgit2/ntk/fix/backend/honor_refresh_capabilitiesVicent Martí2013-09-041-0/+10
|\ \ | | | | | | Of backends and refreshers...
| * | odb: Move the auto refresh logic to the pack backendnulltoken2013-09-041-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously, `git_object_read()`, `git_object_read_prefix()` and `git_object_exists()` were implementing an auto refresh logic. When the expected object couldn't be found in any backend, a call to `git_odb_refresh()` was triggered and the lookup was once again performed against all backends. This commit removes this auto-refresh logic from the odb layer and pushes it down into the pack-backend (as it's the only one currently exposing a `refresh()` endpoint).
* | | Merge pull request #1804 from ethomson/rewritesVicent Martí2013-09-031-0/+3
|\ \ \ | | | | | | | | Minor changes for rewrites
| * | | Split rewrites, status doesn't return rewritesEdward Thomson2013-08-281-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ensure that we apply splits to rewrites, even if we're not interested in examining it closely for rename/copy detection. In keeping with core git, status should not display rewrites, it should simply show files as "modified".
* | | | Merge pull request #1820 from linquize/git_oid_streqVicent Martí2013-09-011-2/+1
|\ \ \ \ | | | | | | | | | | Update documentation of git_oid_streq to remove outdated error code
| * | | | Update documentation of git_oid_streq to remove outdated error codeLinquize2013-08-311-2/+1
| | |/ / | |/| |
* | | | oid: git_oid_shorten_add() sets GITERR_INVALID when OID set is fullLinquize2013-08-311-2/+2
|/ / /
* | | Merge pull request #1805 from libgit2/threading-packed-loadVicent Martí2013-08-282-20/+39
|\ \ \ | |/ / |/| | Thread safety for the refdb_fs
| * | Some documentation improvementsRussell Belfer2013-08-282-20/+39
| | |
* | | Merge pull request #1772 from libgit2/config-iterVicent Martí2013-08-282-4/+100
|\ \ \ | | | | | | | | Configuration iterators redux
| * | | config: don't special-case the multivar iteratorCarlos Martín Nieto2013-08-142-3/+1
| | | | | | | | | | | | | | | | | | | | Build it on top of the normal iterator instead, which lets use re-use a lot of code.
| * | | config: introduce a regex-filtering iteratorCarlos Martín Nieto2013-08-121-0/+12
| | | |
| * | | config: introduce _iterator_new()Carlos Martín Nieto2013-08-121-0/+11
| | | | | | | | | | | | | | | | As the name suggests, it iterates over all the entries
| * | | config: add _next() and _iterator_free()Carlos Martín Nieto2013-08-081-0/+17
| | | | | | | | | | | | | | | | Make it look like the refs iterator API.
| * | | config: working multivar iteratorCarlos Martín Nieto2013-08-082-1/+11
| | | | | | | | | | | | | | | | Implement the foreach version as a wrapper around the iterator.
| * | | config: hopefully get the iterator to work on multivarsCarlos Martín Nieto2013-08-081-1/+1
| | | |
| * | | config: initial multivar iteratorCarlos Martín Nieto2013-08-081-2/+4
| | | |