summaryrefslogtreecommitdiff
path: root/include/git2
Commit message (Collapse)AuthorAgeFilesLines
...
* | | Merge pull request #3444 from ethomson/add_preserves_conflict_modeCarlos Martín Nieto2015-10-151-7/+21
|\ \ \ | |_|/ |/| | Preserve modes from a conflict in `git_index_insert`
| * | index: also try conflict mode when insertingEdward Thomson2015-09-301-7/+21
| |/ | | | | | | | | | | | | | | | | | | When we do not trust the on-disk mode, we use the mode of an existing index entry. This allows us to preserve executable bits on platforms that do not honor them on the filesystem. If there is no stage 0 index entry, also look at conflicts to attempt to answer this question: prefer the data from the 'ours' side, then the 'theirs' side before falling back to the common ancestor.
* | refdb and odb backends must provide `free` functionArthur Schreiber2015-10-012-2/+6
| | | | | | | | | | | | | | | | | | As refdb and odb backends can be allocated by client code, libgit2 can’t know whether an alternative memory allocator was used, and thus should not try to call `git__free` on those objects. Instead, odb and refdb backend implementations must always provide their own `free` functions to ensure memory gets freed correctly.
* | Merge pull request #3411 from spraints/custom-push-headersCarlos Martín Nieto2015-09-302-1/+17
|\ \ | |/ |/| Include custom HTTP headers
| * Accept custom headers for fetch tooMatt Burke2015-09-101-0/+5
| |
| * Tell the git_transport about the custom_headersMatt Burke2015-09-082-1/+7
| |
| * Add custom_headers to git_push_optionsMatt Burke2015-09-081-0/+5
| |
| * Drop extra_http_headers from git_remoteMatt Burke2015-09-081-3/+0
| |
| * Allow the world to set HTTP headers for remotesMatt Burke2015-09-041-0/+3
| |
* | New API: git_index_find_prefixLeo Yang2015-09-041-0/+11
|/ | | | Find the first index entry matching a prefix.
* config: correct documentation for non-existent config fileCarlos Martín Nieto2015-09-031-2/+4
|
* Merge pull request #3402 from ethomson/faster_diffCarlos Martín Nieto2015-09-011-2/+6
|\ | | | | Provide path matching in the iterators (for faster diffs)
| * iterator: better document GIT_DIFF_DISABLE_PATHSPEC_MATCHEdward Thomson2015-08-311-4/+6
| |
| * diff: drop `FILELIST_MATCH`Edward Thomson2015-08-301-7/+0
| | | | | | | | | | Now that non-pathspec matching diffs are implemented at the iterator level, drop `FILELIST_MATCH`ing.
| * diff: better document GIT_DIFF_PATHSPEC_DISABLEEdward Thomson2015-08-281-1/+3
| | | | | | | | | | | | Document that `GIT_DIFF_PATHSPEC_DISABLE` is not necessarily about explicit path matching, but also includes matching of directory names. Enforce this in a test.
| * Move filelist into the iterator handling itself.Edward Thomson2015-08-281-0/+7
| |
* | Merge pull request #3401 from phatblat/pb/doc-warningCarlos Martín Nieto2015-08-301-1/+1
|\ \ | |/ |/| Escape @ in doc comment
| * Escape @ in doc commentBen Chatelain2015-08-291-1/+1
| |
* | cred: add a free function wrappercmn/smart-callbacksCarlos Martín Nieto2015-08-191-0/+11
| |
* | transport: provide a way to get the callbacksCarlos Martín Nieto2015-08-191-0/+22
| | | | | | | | | | | | | | | | libgit2 implementations of smart subtransports can simply reach through the structure, but external implementors cannot. Add these two functions as a way for the smart subtransports to get the callbacks as set by the user.
* | config: perform unlocking via git_transactioncmn/config-txCarlos Martín Nieto2015-08-121-16/+7
| | | | | | | | | | This makes the API for commiting or discarding changes the same as for references.
* | config: expose locking via the main APICarlos Martín Nieto2015-08-121-0/+27
| | | | | | | | | | | | | | | | | | This lock/unlock pair allows for the cller to lock a configuration file to avoid concurrent operations. It also allows for a transactional approach to updating a configuration file. If multiple updates must be made atomically, they can be done while the config is locked.
* | config: implement basic transactional supportCarlos Martín Nieto2015-08-121-0/+14
|/ | | | | | | When a configuration file is locked, any updates made to it will be done to the in-memory copy of the file. This allows for multiple updates to happen while we hold the lock, preventing races during complex config-file manipulation.
* Make giterr_detach no longer publicMichael Procter2015-08-031-12/+0
|
* Merge pull request #3332 from phatblat/ben/doc-warningsCarlos Martín Nieto2015-08-015-8/+8
|\ | | | | Resolve documentation warnings
| * Fix remaining documentation warningsBen Chatelain2015-07-272-2/+2
| |
| * Use correct Doxygen trailing comment syntaxBen Chatelain2015-07-271-4/+4
| |
| * Fix @param names in doc commentsBen Chatelain2015-07-273-3/+3
| |
* | Merge pull request #3303 from libgit2/cmn/index-add-submoduleEdward Thomson2015-07-241-0/+1
|\ \ | | | | | | Allow adding a submodule through git_index_add_bypath
| * | errors: add EDIRECTORYCarlos Martín Nieto2015-07-121-0/+1
| | | | | | | | | | | | | | | This is to be returned when the operation which the user asked for is not possible to do on a directory.
* | | Merge pull request #3305 from libgit2/cmn/reflog-del-backendEdward Thomson2015-07-241-2/+3
|\ \ \ | |_|/ |/| | refdb: delete a ref's reflog upon deletion
| * | refdb: delete a ref's reflog upon deletioncmn/reflog-del-backendCarlos Martín Nieto2015-07-121-2/+3
| |/ | | | | | | | | | | Removing a reflog upon ref deletion is something which only some backends might wish to do. Backends which are database-backed may wish to archive a reflog, log-based ones may not need to do anything.
* | Document git_fetch_options struct and fix typo.Ryan Roden-Corrent2015-07-201-1/+9
|/ | | | | | | | git_fetch_options was missing from the API docs because it lacked a documentation comment above the struct declaration. I used the git_checkout_options docstring as a template. Also fixes a typo in git_remote_prune_refs (remote, not reamote).
* git_cert: child types use proper base typeEdward Thomson2015-07-101-21/+14
|
* Merge pull request #3281 from ethomson/wildcard_filtersCarlos Martín Nieto2015-07-091-1/+4
|\ | | | | filters: custom filters with wildcard attributes
| * filters: custom filters with wildcard attributesEdward Thomson2015-07-011-1/+4
| | | | | | | | | | | | Allow custom filters with wildcard attributes, so that clients can support some random `filter=foo` in a .gitattributes and look up the corresponding smudge/clean commands in the configuration file.
* | Merge pull request #3277 from git-up/git_diff_index_to_indexCarlos Martín Nieto2015-07-071-0/+19
|\ \ | | | | | | Added git_diff_index_to_index()
| * | Added git_diff_index_to_index()Pierre-Olivier Latour2015-06-301-0/+19
| | |
* | | filter: add docs for streaming filterscmn/filter-docCarlos Martín Nieto2015-07-031-2/+35
| | | | | | | | | | | | | | | These functions are available on the public API but don't have any documentation, so they don't appear on the API reference. Fix that.
* | | submodule: completely remove reload_allCarlos Martín Nieto2015-07-011-11/+0
|/ / | | | | | | | | | | | | | | The function was removed, but its declaration and changelog entry about its removal were forgotten. The comment in the test doesn't make any sense as the function doesn't exist anymore, so get rid of it as well.
* | Bump version to 0.23.0 and SOVERSION to 23Carlos Martín Nieto2015-06-281-3/+3
| |
* | Merge pull request #3259 from ethomson/stash_apply_arghCarlos Martín Nieto2015-06-261-0/+1
|\ \ | |/ |/| Stash apply: stage new files even when not updating the index
| * stash: don't allow apply with staged changesEdward Thomson2015-06-251-0/+1
| |
* | Merge pull request #3255 from libgit2/cmn/rename-unspecifiedEdward Thomson2015-06-253-6/+6
|\ \ | |/ |/| Rename FALLBACK to UNSPECIFIED
| * Rename FALLBACK to UNSPECIFIEDcmn/rename-unspecifiedCarlos Martín Nieto2015-06-253-6/+6
| | | | | | | | | | Fallback describes the mechanism, while unspecified explains what the user is thinking.
* | Merge pull request #3246 from libgit2/cmn/dont-grow-borrowedEdward Thomson2015-06-252-6/+5
|\ \ | |/ |/| Don't allow growing borrowed buffers
| * errors: introduce EINVALIDCarlos Martín Nieto2015-06-241-0/+1
| | | | | | | | | | We've been using EINVALIDSPEC for a while to mean this, but that name is too specific. Introduce this to be more explicit.
| * blob: don't recomment using git_buf_growCarlos Martín Nieto2015-06-241-6/+4
| | | | | | | | | | | | | | | | | | We currently recommend using `git_buf_grow` in order to make a buffer make an owned copy of the memory it points to. This is not behaviour we should encourage, so remove this recommendation. The function itself is not changed, as we need to remain compatible, but it will be changed not to allow usage on borrowed buffers.
* | Merge pull request #3097 from libgit2/cmn/submodule-config-stateCarlos Martín Nieto2015-06-243-83/+44
|\ \ | | | | | | Remove run-time configuration settings from submodules
| * | submodule: remove the RESET enum valuescmn/submodule-config-stateCarlos Martín Nieto2015-06-222-9/+1
| | | | | | | | | | | | | | | These are not useful anymore, as we don't affect the instance's configuration.
View Lorry Controller Status