summaryrefslogtreecommitdiff
path: root/include/git2
Commit message (Collapse)AuthorAgeFilesLines
...
* | | 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
| |
* | Merge pull request #2839 from swisspol/typoEdward Thomson2015-01-261-1/+1
|\ \ | | | | | | Fixed typo in git_repository_reinit_filesystem() documentation
| * | Fixed typo in git_repository_reinit_filesystem() documentationPierre-Olivier Latour2015-01-231-1/+1
| | |
* | | Make sure sys/repository.h includes the required headersPierre-Olivier Latour2015-01-231-0/+3
|/ / | | | | | | | | It was missing "common.h" and "types.h" like other system headers. This generated compilation errors if including it directly.
* | checkout: remove files before writing new onesEdward Thomson2015-01-201-0/+8
| | | | | | | | | | | | | | On case insensitive filesystems, we may have files in the working directory that case fold to a name we want to write. Remove those files (by default) so that we will not end up with a filename that has the unexpected case.
* | mkdir: walk up tree to mkdirEdward Thomson2015-01-201-0/+1
| | | | | | | | | | | | Walk up the tree to mkdir, which is less immediately efficient, but allows us to look at intermediate directories that may need attention.
* | checkout: introduce git_checkout_perfdataEdward Thomson2015-01-201-0/+15
|/ | | | | Checkout can now provide performance data about the number of (some) syscalls performed using an optional callback.
* Merge branch 'pr/2740'Edward Thomson2015-01-141-22/+49
|\
| * Added GIT_HASHSIG_ALLOW_SMALL_FILES to allow computing signatures for small ↵Pierre-Olivier Latour2015-01-141-22/+49
| | | | | | | | | | | | | | | | | | | | | | | | | | files The implementation of the hashsig API disallows computing a signature on small files containing only a few lines. This new flag disables this behavior. git_diff_find_similar() sets this flag by default which means that rename / copy detection of small files will now work. This in turn affects the behavior of the git_status and git_blame APIs which will now detect rename of small files assuming the right options are passed.
* | Add extern function to initialize submodule update options.David Calavera2015-01-071-3/+18
| |
* | Merge pull request #2799 from ethomson/merge_docCarlos Martín Nieto2015-01-051-0/+8
|\ \ | | | | | | Better document `git_merge_commits`
| * | Better document `git_merge_commits`Edward Thomson2015-01-051-0/+8
| | | | | | | | | | | | | | | | | | | | | `git_merge_commits` (and thus `git_merge`) do not use the same strategy as `git-merge-recursive` wherein they can produce an artificial common ancestor that is the merge of all common ancestors. Document this accordingly.
* | | Bump version to 0.22Carlos Martín Nieto2015-01-051-3/+3
| | | | | | | | | | | | Bump the version number to 0.22.0 and the SOVERSION to 22.
* | | Merge commit 'refs/pull/2632/head' of github.com:libgit2/libgit2Carlos Martín Nieto2015-01-051-1/+65
|\ \ \ | |/ / |/| |
| * | Introduce a convenience function for submodule updatejamill/submodule_updateJameson Miller2014-12-221-1/+65
| |/ | | | | | | | | | | | | | | | | This introduces the functionality of submodule update in 'git_submodule_do_update'. The existing 'git_submodule_update' function is renamed to 'git_submodule_update_strategy'. The 'git_submodule_update' function now refers to functionality similar to `git submodule update`, while `git_submodule_update_strategy` is used to get the configured value of submodule.<name>.update.
* | Include git2/common.h in sys/openssl.h.David Calavera2015-01-021-1/+1
| |
* | Fixed git_revert() documentationPierre-Olivier Latour2014-12-301-1/+1
| |
* | Merge pull request #2761 from libgit2/cmn/fetch-pruneEdward Thomson2014-12-301-0/+16
|\ \ | | | | | | Remote-tracking branch prunning
| * | fetch: remove the prune setterCarlos Martín Nieto2014-12-141-10/+0
| | | | | | | | | | | | | | | | | | | | | | | | This option does not get persisted to disk, which makes it different from the rest of the setters. Remove it until we go all the way. We still respect the configuration option, and it's still possible to perform a one-time prune by calling the function.
| * | remote: prune refs when fetchingLinquize2014-12-141-0/+26
| | |
* | | Merge pull request #2762 from libgit2/cmn/hide-pushEdward Thomson2014-12-302-111/+14
|\ \ \ | | | | | | | | remote: remove git_push from the public API
| * | | remote: remove git_push from the public APIcmn/hide-pushCarlos Martín Nieto2014-12-302-111/+14
| |/ / | | | | | | | | | | | | Instead we provide git_remote_upload() and git_remote_update_tips() in order to have a parallel API for fetching and pushing.
* | | treebuilder: rename _create() to _new()cmn/treebuilder-newCarlos Martín Nieto2014-12-271-1/+1
| | | | | | | | | | | | | | | | | | This function is a constructor, so let's name it like one and leave _create() for the reference functions, which do create/write the reference.
* | | index: reuc and name entrycounts should be size_tEdward Thomson2014-12-221-2/+2
| |/ |/| | | | | | | | | For the REUC and NAME entries, we use size_t internally, and we take size_t for the get_byindex() functions, but the entrycount() functions strangely cast to an unsigned int instead.
View Lorry Controller Status