summaryrefslogtreecommitdiff
path: root/include
Commit message (Collapse)AuthorAgeFilesLines
* remote: update documentationCarlos Martín Nieto2014-06-111-18/+60
| | | | | Add docs for git_clone_local_t and move the docs for the git_clone_options to each field.
* pathspec: use C guards in headerCarlos Martín Nieto2014-06-101-0/+3
|
* remote: fix rename docsCarlos Martín Nieto2014-06-091-3/+0
|
* Bump version to 0.21.0Carlos Martín Nieto2014-06-081-3/+3
| | | | Bump library version to 0.21.0 and SONAME to 21
* Change SOVERSION at API breakscmn/soversionCarlos Martín Nieto2014-06-081-0/+2
| | | | | | | | | | Since the SOVERSION doesn't need to follow the library's version and simply needs to be monotonically increasing whenever we release something that breaks the ABI, we can set some number and allow multiple versions of the library to be installed side-by-side. We start here with the minor version as that's what we release for now, and it allows to backport this change to earlier versions.
* remote: don't free the remote on deletecmn/remote-rename-moreCarlos Martín Nieto2014-06-061-2/+0
| | | | This was a bad idea. Don't free except in the free function.
* remote: return problem refspecs instead of using a callbackCarlos Martín Nieto2014-06-061-3/+5
| | | | | | There is no reason why we need to use a callback here. A string array fits better with the usage, as this is not an event and we don't need anything from the user.
* index: split GIT_IDXENTRY into two flag enumscmn/docstuffCarlos Martín Nieto2014-06-031-28/+31
| | | | | | The documentation has shown this as a single enum for a long time. These should in fact be two enums. One with the bits for the flags and another with the bits for the extended flags.
* Formatting fixes for the docsCarlos Martín Nieto2014-06-035-58/+58
| | | | | These are some issues I found while playing around with the new parser for docurium.
* Merge pull request #2011 from libgit2/cmn/clone-localVicent Marti2014-05-291-0/+37
|\ | | | | Local clone
| * clone: allow for linking in local cloneCarlos Martín Nieto2014-05-281-0/+4
| | | | | | | | | | | | | | | | If requested, git_clone_local_into() will try to link the object files instead of copying them. This only works on non-Windows (since it doesn't have this) when both are on the same filesystem (which are unix semantics).
| * clone: add flag not to linkCarlos Martín Nieto2014-05-281-0/+1
| |
| * clone: add flags to override whether to perform a local cloneCarlos Martín Nieto2014-05-281-0/+7
| |
| * clone: perform a "local clone" when given a local pathCarlos Martín Nieto2014-05-281-0/+25
| | | | | | | | | | | | | | | | When git is given such a path, it will perform a "local clone", bypassing the git-aware protocol and simply copying over all objects that exist in the source. Copy this behaviour when given a local path.
* | [Blob] Update documentation for is_binary.Ungureanu Marius2014-05-281-1/+1
| | | | | | filter.h tells me that we check the first 8000 bytes.
* | Modify GIT_MERGE_CONFIG -> GIT_MERGE_PREFERENCEEdward Thomson2014-05-271-6/+7
| |
* | Move GIT_MERGE_CONFIG_* to its own enumEdward Thomson2014-05-271-3/+11
| |
* | Introduce GIT_MERGE_CONFIG_* for merge.ff settingsEdward Thomson2014-05-271-0/+12
|/ | | | | | git_merge_analysis will now return GIT_MERGE_CONFIG_NO_FASTFORWARD when merge.ff=false and GIT_MERGE_CONFIG_FASTFORWARD_ONLY when merge.ff=true
* Fixed miscellaneous documentation errors.Michael Anderson2014-05-2310-34/+31
|
* remote: add api to guess the remote's default branchCarlos Martín Nieto2014-05-211-0/+18
| | | | | If the remote supports the symref protocol extension, then we return that, otherwise we guess with git's rules.
* remote: expose the remote's symref mappingsCarlos Martín Nieto2014-05-211-0/+5
| | | | | Add a symref_target field to git_remote_head to expose the symref mappings to the user.
* message: don't assume the comment charcmn/comment-charCarlos Martín Nieto2014-05-181-3/+5
| | | | | The comment char is configurable and we need to provide a way for the user to specify which comment char they chose for their message.
* Merge pull request #2313 from libgit2/cmn/remote-deleteVicent Marti2014-05-161-0/+13
|\ | | | | Remote deletion
| * remote: Introduce git_remote_delete()nulltoken2014-04-301-0/+13
| |
* | Minor fixes for warnings and error propagationRussell Belfer2014-05-121-1/+5
| |
* | Merge pull request #2188 from libgit2/cmn/config-snapshotRussell Belfer2014-05-123-3/+43
|\ \ | | | | | | Configuration snapshotting
| * | repository: introduce a convenience config snapshot methodcmn/config-snapshotCarlos Martín Nieto2014-05-071-1/+13
| | | | | | | | | | | | | | | | | | Accessing the repository's config and immediately taking a snapshot of it is a common operation, so let's provide a convenience function for it.
| * | config: document the how long the pointers are valid forCarlos Martín Nieto2014-04-181-1/+14
| | |
| * | config: refresh before reading a valueCarlos Martín Nieto2014-04-181-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | With the isolation of complex reads, we can now try to refresh the on-disk file before reading a value from it. This changes the semantics a bit, as before we could be sure that a string we got from the configuration was valid until we wrote or refreshed. This is no longer the case, as a read can also invalidate the pointer.
| * | config: implement config snapshottingCarlos Martín Nieto2014-04-182-0/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In order to have consistent views of the config files for remotes, submodules et al. and a configuration that represents what is currently stored on-disk, we need a way to provide a view of the configuration that does not change. The goal here is to provide the snapshotting part by creating a read-only copy of the state of the configuration at a particular point in time, which does not change when a repository's main config changes.
* | | Use unsigned type for APIs with opt flag maskRussell Belfer2014-05-082-4/+5
| | |
* | | Add filter options and ALLOW_UNSAFERussell Belfer2014-05-063-3/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | Diff and status do not want core.safecrlf to actually raise an error regardless of the setting, so this extends the filter API with an additional options flags parameter and adds a flag so that filters can be applied with GIT_FILTER_OPT_ALLOW_UNSAFE, indicating that unsafe filter application should be downgraded from a failure to a warning.
* | | Doc fixesRussell Belfer2014-05-022-2/+7
| | |
* | | Merge pull request #2308 from libgit2/rb/diff-update-index-stat-cacheVicent Marti2014-05-0217-125/+135
|\ \ \ | | | | | | | | Reduce excessive OID calculation for diff and stat
| * | | Fix remaining init_options inconsistenciesRussell Belfer2014-05-028-43/+35
| | | | | | | | | | | | | | | | | | | | There were a couple of "init_opts()" functions a few more cases of structure initialization that I somehow missed.
| * | | Make init_options fns use unsigned ints and macroRussell Belfer2014-05-026-52/+49
| | | | | | | | | | | | | | | | | | | | Use an unsigned int for the version and add a helper macro so the code is simplified (and so the error message is a common string).
| * | | Remove trace / add git_diff_perfdata struct + apiRussell Belfer2014-05-024-51/+59
| | | |
| * | | Get rid of redundant git_diff_options_init fnRussell Belfer2014-05-021-17/+0
| | | | | | | | | | | | | | | | Since git_diff_init_options was introduced, remove this old fn.
| * | | Add payloads, bitmaps to trace APIRussell Belfer2014-05-021-13/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is a proposed adjustment to the trace APIs. This makes the trace levels into a bitmask so that they can be selectively enabled and adds a callback-level payload, plus a message-level payload. This makes it easier for me to a GIT_TRACE_PERF callbacks that are simply bypassed if the PERF level is not set.
| * | | Add GIT_STATUS_OPT_UPDATE_INDEX and use trace APIRussell Belfer2014-05-021-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | This adds an option to refresh the stat cache while generating status. It also rips out the GIT_PERF stuff I had an makes use of the trace API to keep statistics about what happens during diff.
| * | | Add diff option to update index stat cacheRussell Belfer2014-05-021-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When diff is scanning the working directory, if it finds a file where it is not sure if the index entry matches the working dir, it will recalculate the OID (which is pretty expensive). This adds a new flag to diff so that if the OID calculation finds that the file actually has not changed (i.e. just the modified time was altered or such), then it will refresh the stat cache in the index so that future calls to diff will not have to check the oid again.
| * | | Lay groundwork for updating stat cache in diffRussell Belfer2014-05-021-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reorganized the diff OID calculation to make it easier to correctly update the stat cache during a diff once the flags to do so are enabled. This includes marking the path of a git_index_entry as const so we can make a "fake" git_index_entry with a "const char *" path and not get warnings. I was a little surprised at how unobtrusive this change was, but I think it's probably a good thing.
* | | | Merge pull request #2310 from libgit2/cmn/commit-create-safeRussell Belfer2014-05-021-2/+3
|\ \ \ \ | |/ / / |/| | | commit: safer commit creation with reference update
| * | | commit: safer commit creation with reference updatecmn/commit-create-safeCarlos Martín Nieto2014-04-301-2/+3
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The current version of the commit creation and amend function are unsafe to use when passing the update_ref parameter, as they do not check that the reference at the moment of update points to what the user expects. Make sure that we're moving history forward when we ask the library to update the reference for us by checking that the first parent of the new commit is the current value of the reference. We also make sure that the ref we're updating hasn't moved between the read and the write. Similarly, when amending a commit, make sure that the current tip of the branch is the commit we're amending.
* | | refs: document _next_name()Carlos Martín Nieto2014-04-301-0/+11
|/ / | | | | | | | | If it's not documented, it doesn't show up in the docs (and we really should document, anyway).
* | Merge pull request #2284 from jacquesg/push-progress-callbackVicent Marti2014-04-257-9/+9
|\ \ | | | | | | Fire progress and update tips callbacks also for pushes.
| * | Don't redefine the same callback types, their signatures may changeJacques Germishuys2014-04-217-9/+9
| | |
| * | Rename progress callback to sideband_progressJacques Germishuys2014-04-211-1/+1
| | |
| * | Check the return codes of remote callbacks.Jacques Germishuys2014-04-211-2/+1
| | | | | | | | | | | | The user may have requested that the operation be cancelled.
| * | Fire progress callbacks also for pushes.Jacques Germishuys2014-04-201-1/+2
| | | | | | | | | | | | | | | It's not very useful to only know that a pre-receive hook has declined a push, you probably want to know why.