summaryrefslogtreecommitdiff
path: root/include/git2
Commit message (Collapse)AuthorAgeFilesLines
...
* | rebase: init and open take a rebase_optionsEdward Thomson2015-04-201-24/+30
| | | | | | | | | | | | `git_rebase_init` and `git_rebase_open` should take a `git_rebase_options` and use it for future rebase operations on that `rebase` object.
* | rebase: take `checkout_options` where appropriateEdward Thomson2015-04-201-2/+9
| |
* | reset: `git_checkout_options` is `const`Edward Thomson2015-04-201-2/+2
| |
* | rebase: identify a rebase that has not startedEdward Thomson2015-04-201-0/+6
|/ | | | | | In `git_rebase_operation_current()`, indicate when a rebase has not started (with `GIT_REBASE_NO_OPERATION`) rather than conflating that with the first operation being in-progress.
* Merge pull request #2999 from pks-t/submodule-set-urlEdward Thomson2015-04-171-0/+16
|\ | | | | Implement git_submodule_set_branch.
| * Implement git_submodule_set_branch.Patrick Steinhardt2015-04-121-0/+16
| |
* | Merge pull request #3037 from libgit2/cmn/hide-then-pushEdward Thomson2015-04-161-8/+10
|\ \ | | | | | | Handle hide-then-push in the revwalk
| * | revwalk: reword the push textcmn/hide-then-pushCarlos Martín Nieto2015-04-131-8/+10
| | | | | | | | | | | | | | | | | | As it seems it's not quite clear what it means to push a commit, try to be more explicit about adding a new root and that we may not see this commit if it is hidden.
* | | Merge pull request #2974 from libgit2/cmn/clone-everythingEdward Thomson2015-04-101-0/+12
|\ \ \ | |/ / |/| | Make sure to pack referenced objects for non-branches
| * | packbuilder: introduce git_packbuilder_insert_recur()Carlos Martín Nieto2015-03-171-0/+12
| |/ | | | | | | | | | | This function recursively inserts the given object and any referenced ones. It can be thought of as a more general version of the functions to insert a commit or tree.
* | Entry argument passed to git_index_add_frombuffer() should be constPierre-Olivier Latour2015-04-031-1/+1
| |
* | Merge pull request #2990 from leoyanggit/custom_paramEdward Thomson2015-03-241-4/+12
|\ \ | | | | | | Add a custom param to git_smart_subtransport_definition
| * | Add a custom param to git_smart_subtransport_definitionLeo Yang2015-03-181-4/+12
| | | | | | | | | | | | | | | The smart transport has already take the payload param. For the sub transport a payload param is useful for the implementer.
* | | Merge pull request #2947 from libgit2/cmn/notes-bufEdward Thomson2015-03-241-2/+2
|\ \ \ | | | | | | | | note: use a git_buf to return the default namespace
| * | | note: use a git_buf to return the default namespacecmn/notes-bufCarlos Martín Nieto2015-03-171-2/+2
| | |/ | |/| | | | | | | | | | | | | | | | The caller has otherwise no way to know how long the string will be allocated or ability to free it. This fixes #2944.
* | | Merge pull request #2967 from jacquesg/merge-whitespaceEdward Thomson2015-03-181-3/+20
|\ \ \ | |/ / |/| | Allow merges of files (and trees) with whitespace problems/fixes
| * | Added options to enable patience and minimal diff driversJacques Germishuys2015-03-161-0/+6
| | |
| * | Collapse whitespace flags into git_merge_file_flags_tJacques Germishuys2015-03-161-23/+11
| | |
| * | Renamed git_merge_options 'flags' to 'tree_flags'Jacques Germishuys2015-03-161-2/+2
| | |
| * | Allow for merges with whitespace discrepanciesJacques Germishuys2015-03-161-0/+23
| | |
* | | Merge pull request #2962 from libgit2/cmn/reflog-annotatedEdward Thomson2015-03-174-0/+69
|\ \ \ | | | | | | | | Add annotated versions of ref-modying functions
| * | | annotated_commit: provide a constructor from a revspecCarlos Martín Nieto2015-03-161-0/+17
| | | | | | | | | | | | | | | | | | | | | | | | This extra constructor will be useful for the annotated versions of ref-modifying functions, as it allows us to create a commit with the extended sha syntax which was used to retrieve it.
| * | | Add annotated commit versions of reflog-modifying functionsCarlos Martín Nieto2015-03-163-0/+52
| |/ / | | | | | | | | | | | | | | | | | | We do not always want to put the id directly into the reflog, but we want to speicfy what a user typed. For this use-case we provide annotated version of a few functions which let the caller specify what user-friendly name was used when asking for the operation.
* | | Merge pull request #2972 from libgit2/cmn/pack-objects-walkEdward Thomson2015-03-171-0/+13
|\ \ \ | |/ / |/| | [WIP] Smarter pack-building
| * | pack-objects: fill a packbuilder from a walkCarlos Martín Nieto2015-03-111-0/+13
| |/ | | | | | | | | | | | | | | | | | | | | Most use-cases for the object packer communicate in terms of commits which each side has. We already have an object to specify this relationship between commits, namely git_revwalk. By knowing which commits we want to pack and which the other side already has, we can perform similar optimisations to git, by marking each tree as interesting or uninteresting only once, and not sending those trees which we know the other side has.
* | Merge commit 'refs/pull/2879/head' of ssh://github.com/libgit2/libgit2Carlos Martín Nieto2015-03-111-0/+32
|\ \ | |/ |/|
| * Add API to add a memory buffer to an indexDamien PROFETA2015-02-251-0/+32
| | | | | | | | | | | | git_index_add_frombuffer enables now to store a memory buffer in the odb and to store an entry in the index directly if the index is attached to a repository.
* | config: borrow refcounted referencescmn/config-borrow-entryCarlos Martín Nieto2015-03-032-10/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This changes the get_entry() method to return a refcounted version of the config entry, which you have to free when you're done. This allows us to avoid freeing the memory in which the entry is stored on a refresh, which may happen at any time for a live config. For this reason, get_string() has been forbidden on live configs and a new function get_string_buf() has been added, which stores the string in a git_buf which the user then owns. The functions which parse the string value takea advantage of the borrowing to parse safely and then release the entry.
* | repository: remove log message override for switching the active branchCarlos Martín Nieto2015-03-031-9/+3
| | | | | | | | | | | | We want to use the "checkout: moving from ..." message in order to let git know when a change of branch has happened. Make the convenience functions for this goal write this message.
* | push: remove reflog message overrideCarlos Martín Nieto2015-03-031-6/+5
| | | | | | | | We always use "update by push".
* | branch: don't accept a reflog message overrideCarlos Martín Nieto2015-03-031-10/+2
| | | | | | | | | | | | | | This namespace is about behaving like git's branch command, so let's do exactly that instead of taking a reflog message. This override is still available via the reference namespace.
* | reset: remove reflog message overrideCarlos Martín Nieto2015-03-031-8/+1
| | | | | | | | | | This function is meant to simulate what git does in the reset command, so we should include the reflog message in that.
* | Remove the signature from ref-modifying functionsCarlos Martín Nieto2015-03-038-67/+46
| | | | | | | | | | | | | | | | | | | | The signature for the reflog is not something which changes dynamically. Almost all uses will be NULL, since we want for the repository's default identity to be used, making it noise. In order to allow for changing the identity, we instead provide git_repository_set_ident() and git_repository_ident() which allow a user to override the choice of signature.
* | Merge pull request #2908 from ethomson/safe_createCarlos Martín Nieto2015-03-033-24/+17
|\ \ | | | | | | Allow checkout to handle newly cloned repositories, remove `GIT_CHECKOUT_SAFE_CREATE`
| * | checkout: remove `GIT_CHECKOUT_SAFE_CREATE` as a strategyEdward Thomson2015-02-273-24/+17
| |/
* | win32: add the patch level to the .dll fileversionEdward Thomson2015-03-021-0/+1
|/ | | | | | | | | Win32 DLLs have four fields for the version number (major, minor, teeny, patch). If a consumer wants to build a custom DLL, it may be useful to set the patchlevel version number in the DLL. This value only affects the DLL version number, it does not affect the resultant "version number", which remains major.minor.teeny.
* git_filter_opt_t -> git_filter_flag_tEdward Thomson2015-02-192-7/+7
| | | | | For consistency with the rest of the library, where an opt is an options *structure*.
* git_writestream: from git_filter_streamEdward Thomson2015-02-183-13/+13
|
* filters: introduce streaming filtersEdward Thomson2015-02-173-0/+33
| | | | | | | Add structures and preliminary functions to take a buffer, file or blob and write the contents in chunks through an arbitrary number of chained filters, finally writing into a user-provided function accept the contents.
* Merge pull request #2831 from ethomson/merge_lockCarlos Martín Nieto2015-02-151-1/+7
|\ | | | | merge: lock index during the merge (not just checkout)
| * checkout: introduce GIT_CHECKOUT_DONT_WRITE_INDEXEdward Thomson2015-02-141-1/+7
| |
* | rebase: allow `NULL` branch to indicate `HEAD`Edward Thomson2015-02-131-1/+2
|/ | | | | Don't require the branch to rebase, if given `NULL`, simply look up `HEAD`.
* Merge pull request #2893 from phatblat/ben/pr/doc-commentsCarlos Martín Nieto2015-02-119-23/+22
|\ | | | | Fix doc comment formatting
| * Use correct Doxygen trailing comment syntaxBen Chatelain2015-02-103-7/+7
| |
| * Fix doc comment formattingBen Chatelain2015-02-109-23/+22
| |
* | Fixed error when including git2/include/sys/stream.hJohn Haley2015-02-111-0/+2
|/
* diff docs: update `git_diff_delta` descriptionEdward Thomson2015-02-032-9/+6
|
* Clarified git_repository_is_empty() documentationPierre-Olivier Latour2015-01-271-2/+2
|
* Merge pull request #2819 from libgit2/cmn/config-get-pathEdward Thomson2015-01-261-0/+32
|\ | | | | config: add parsing and getter for paths
| * config: add parsing and getter for pathscmn/config-get-pathCarlos Martín Nieto2015-01-141-0/+32
| |