summaryrefslogtreecommitdiff
path: root/include/git2
Commit message (Collapse)AuthorAgeFilesLines
...
* | 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.
* | Merge pull request #2759 from libgit2/cmn/openssl-sysEdward Thomson2014-12-201-11/+9
|\ \ | | | | | | Make OpenSSL locking warnings more severe
| * | Make the OpenSSL locking function warnings more severeCarlos Martín Nieto2014-12-121-11/+9
| |/ | | | | | | | | Our git_openssl_set_locking() would ideally not exist. Make it clearer that we provide it as a last resort and you should prefer anything else.
* | Fix public header on sys/refs.hDamien PROFETA2014-12-191-0/+11
| | | | | | | | | | GIT_BEGIN/END_DECL were missing from sys/refs.h and preventing compilation with g++ as the symbol were mangled.
* | treebuilder: take a repository for path validationEdward Thomson2014-12-171-3/+3
|/ | | | | | Path validation may be influenced by `core.protectHFS` and `core.protectNTFS` configuration settings, thus treebuilders can take a repository to influence their configuration.
* push: reword comment on finish()cmn/push-error-concernsCarlos Martín Nieto2014-12-101-5/+7
| | | | This should make it clearer what the return value implies.
* push: fold unpack_ok() into finish()Carlos Martín Nieto2014-12-101-11/+2
| | | | | The push cannot be successful if we sent a bad packfile. We should return an error in that case instead of storing it elsewhere.
* Merge pull request #2678 from libgit2/cmn/io-streamEdward Thomson2014-12-101-0/+40
|\ | | | | Introduce stackable IO streams
| * stream: constify the write bufferCarlos Martín Nieto2014-12-101-1/+1
| |
| * Introduce stackable IO streamsCarlos Martín Nieto2014-12-101-0/+40
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We currently have gitno for talking over TCP, but this needs to know about both plaintext and OpenSSL connections and the code has gotten somewhat messy with ifdefs determining which version of the function should be called. In order to clean this up and abstract away the details of sending over the different types of streams, we can instead use an interface and stack stream implementations. We may not be able to use the stackability with all streams, but we are definitely be able to use the abstraction which is currently spread between different bits of gitno.
* | Merge pull request #2748 from libgit2/cmn/doc-allEdward Thomson2014-12-0618-29/+127
|\ \ | | | | | | doc: add documentation to all the public structs and enums
| * | doc: add documentation to all the public structs and enumscmn/doc-allCarlos Martín Nieto2014-12-0618-29/+127
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This makes them show up in the reference, even if the text itself isn't the most descriptive. These have been found with grep -Przon '\n\ntypedef struct.*?\{' -- include grep -Przon '\n\ntypedef enum.*?\{' -- include
* | | notes: fix comments for git_note_next()cmn/notes-consistencyCarlos Martín Nieto2014-12-061-4/+2
| | | | | | | | | | | | | | | The iterator is the last argument. There is also no returned notes, just ids, so the comment about freeing is out of place.
* | | notes: move the notes name argumentCarlos Martín Nieto2014-12-061-3/+3
|/ / | | | | | | | | Make it consistent between git_note_create() and git_note_remote() by putting it after the repository.
* | Merge pull request #2744 from epmatsw/spellingnulltoken2014-12-058-8/+8
|\ \ | | | | | | Spelling fixes
| * | Spelling fixesWill Stamper2014-12-048-8/+8
| | |
* | | init: return the number of initializationsEdward Thomson2014-12-041-4/+10
|/ /
* | Merge pull request #2718 from libgit2/cmn/peeling-errorsEdward Thomson2014-11-232-8/+16
|\ \ | |/ |/| peel: reject bad queries with EPEEL
| * peel: reject bad queries with EINVALIDSPECcmn/peeling-errorsCarlos Martín Nieto2014-11-222-8/+16
| | | | | | | | | | | | | | | | | | | | There are some combination of objects and target types which we know cannot be fulfilled. Return EINVALIDSPEC for those to signify that there is a mismatch in the user-provided data and what the object model is capable of satisfying. If we start at a tag and in the course of peeling find out that we cannot reach a particular type, we return EPEEL.
* | remote: don't say we free the remote on disconnectcmn/remote-lsCarlos Martín Nieto2014-11-191-2/+1
| | | | | | | | | | On disconnect we simply ask the transport to close the connection, we do not free it.
* | remote: clarify which list of references _ls() returnsCarlos Martín Nieto2014-11-191-6/+11
|/ | | | | Make it clear that this is not the ls-remote command but a way to access the data we have and how long it's kept around.
* Merge pull request #2608 from libgit2/cmn/remote-pushEdward Thomson2014-11-181-0/+40
|\ | | | | Provide a convenience function `git_remote_push()`
| * remote: use configured push refspecs if none are givencmn/remote-pushCarlos Martín Nieto2014-11-091-1/+2
| | | | | | | | | | If the user does not pass any refspecs to push, try to use those configured via the configuration or via add_push().
| * remote: introduce git_remote_push()Carlos Martín Nieto2014-11-091-0/+39
| | | | | | | | | | | | | | | | | | This function, similar in style to git_remote_fetch(), performs all the steps required for a push, with a similar interface. The remote callbacks struct has learnt about the push callbacks, letting us set the callbacks a single time instead of setting some in the remote and some in the push operation.
* | Rename git_threads_ to git_libgit2_Carlos Martín Nieto2014-11-082-26/+38
|/ | | | | | This describes their purpose better, as we now initialize ssl and some other global stuff in there. Calling the init function is not something which has been optional for a while now.
* Merge pull request #2698 from libgit2/cmn/fetchhead-refactorEdward Thomson2014-11-081-0/+11
|\ | | | | Refactor fetchhead
| * branch: add getter for the upstream remote nameCarlos Martín Nieto2014-11-081-0/+11
| | | | | | | | This gets the value from branch.<foo>.remote.
* | Merge pull request #2695 from libgit2/cmn/remote-lookupEdward Thomson2014-11-081-1/+1
|\ \ | | | | | | remote: rename _load() to _lookup()
View Lorry Controller Status