summaryrefslogtreecommitdiff
path: root/include
Commit message (Collapse)AuthorAgeFilesLines
* remote: prune refs when fetchingLinquize2014-12-141-0/+26
|
* 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.
* | Fixed git2.h not including threads.h anymorePierre-Olivier Latour2014-11-151-1/+2
| |
* | Rename git_threads_ to git_libgit2_Carlos Martín Nieto2014-11-083-27/+39
|/ | | | | | 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()
| * | remote: rename _load() to _lookup()cmn/remote-lookupCarlos Martín Nieto2014-11-081-1/+1
| |/ | | | | | | This brings it in line with the rest of the lookup functions.
* | git_status_file now takes an exact pathUngureanu Marius2014-11-071-1/+2
|/ | | | | | This function has one output but can match multiple files, which can be unexpected for the user, which would usually path the exact path of the file he wants the status of.
* Merge pull request #2676 from libgit2/cmn/threadingEdward Thomson2014-11-061-0/+16
|\ | | | | Threading and crypto libraries
| * ssl: separate locking init from general initCarlos Martín Nieto2014-11-011-0/+16
| | | | | | | | | | Extract the lock-setting functions into their own, as we cannot assume that it's ok for us to set this unconditionally.
* | Merge pull request #2661 from swisspol/2656Edward Thomson2014-11-031-2/+2
|\ \ | | | | | | Changed context_lines and interhunk_lines to uint32_t to match struct s_xdemitconf
| * | Changed context_lines and interhunk_lines to uint32_t to match struct ↵Pierre-Olivier Latour2014-10-271-2/+2
| |/ | | | | | | s_xdemitconf
* | merge: talk about the merging state after git_merge()Carlos Martín Nieto2014-11-021-0/+5
|/ | | | | Since it's not necessarily obvious, mention the merging state and how to clear it.
* rebase: updates based on PR commentsEdward Thomson2014-10-262-17/+16
|
* s/git_merge_head/git_annotated_commitEdward Thomson2014-10-265-70/+109
| | | | | Rename git_merge_head to git_annotated_commit, as it becomes used in more operations than just merge.
* rebase: oid member of operation should be constEdward Thomson2014-10-261-1/+1
|
* git_rebase: iterators for operationsEdward Thomson2014-10-261-0/+27
|
* rebase: preload all operationsEdward Thomson2014-10-261-2/+2
|
* rebase: init/open a git_rebase objectEdward Thomson2014-10-262-11/+34
|
* git_rebase_next: provide info about the operationEdward Thomson2014-10-261-6/+68
|
* git_rebase_finish: rewrite notes when finishing rebaseEdward Thomson2014-10-261-1/+12
|
* Introduce `git_note_author`, `git_note_committer`Edward Thomson2014-10-261-0/+17
|
* Introduce git_rebase_finish to complete a rebaseEdward Thomson2014-10-261-0/+12
|
* git_rebase_commit: drop already-picked commitsEdward Thomson2014-10-262-1/+4
| | | | | | Already cherry-picked commits should not be re-included. If all changes included in a commit exist in the upstream, then we should error with GIT_EAPPLIED.
* Introduce git_rebase_commitEdward Thomson2014-10-261-0/+28
| | | | Commit the current patch of a rebase process.
* Introduce git_rebase_nextEdward Thomson2014-10-261-0/+13
| | | | | | `git_rebase_next` will apply the next patch (or cherry-pick) operation, leaving the results checked out in the index / working directory so that consumers can resolve any conflicts, as appropriate.
* Introduce git_rebase_abortEdward Thomson2014-10-261-0/+13
| | | | | Abort an in-progress rebase and move the working directory and repository back to the ORIG_HEAD state.
* git_reset: const the git_signature argEdward Thomson2014-10-261-1/+1
|
* Introduce git_rebase to set up a rebase sessionEdward Thomson2014-10-262-0/+74
| | | | | | Introduce `git_rebase` to set up a rebase session that can then be continued. Immediately, only merge-type rebase is supported.
* Merge pull request #2638 from libgit2/cmn/config-refresh-removeEdward Thomson2014-10-242-15/+0
|\ | | | | config: remove the refresh function and backend field
| * config: remove the refresh function and backend fieldcmn/config-refresh-removeCarlos Martín Nieto2014-10-232-15/+0
| | | | | | | | | | | | We have been refreshing on read and write for a while now, so git_config_refresh() is at best a no-op, and might just end up wasting cycles.
View Lorry Controller Status