summaryrefslogtreecommitdiff
path: root/include/git2
Commit message (Collapse)AuthorAgeFilesLines
* http: introduce GIT_ERROR_HTTPethomson/gssapiEdward Thomson2020-01-241-1/+2
| | | | | Disambiguate between general network problems and HTTP problems in error codes.
* httpclient: support expect/continueEdward Thomson2020-01-241-1/+7
| | | | | | | | | | | | | Allow users to opt-in to expect/continue handling when sending a POST and we're authenticated with a "connection-based" authentication mechanism like NTLM or Negotiate. If the response is a 100, return to the caller (to allow them to post their body). If the response is *not* a 100, buffer the response for the caller. HTTP expect/continue is generally safe, but some legacy servers have not implemented it correctly. Require it to be opt-in.
* merge: Return non-const git_repository from git_merge_driver_source_repo ↵Laurence McGlashan2020-01-151-1/+1
| | | | accessor.
* Correct typo in name of referenced parameterRemy Suen2020-01-021-1/+1
| | | Signed-off-by: Remy Suen <remy.suen@gmail.com>
* Merge pull request #5300 from tiennou/fix/branch-documentationPatrick Steinhardt2019-12-131-57/+74
|\ | | | | branch: clarify documentation around branches
| * refs: rename git_reference__set_name to git_reference__reallocEtienne Samson2019-12-131-0/+6
| | | | | | | | | | | | | | | | | | | | | | As git_reference__name will reallocate storage to account for longer names (it's actually allocator-dependent), it will cause all existing pointers to the old object to become dangling, as they now point to freed memory. Fix the issue by renaming to a more descriptive name, and pass a pointer to the actual reference that can safely be invalidated if the realloc succeeds.
| * branch: clarify documentation around branchesEtienne Samson2019-12-071-57/+68
| |
* | stash: make comment match codeJosh Bleecher Snyder2019-12-041-1/+1
|/ | | | There is no git_stash_apply_flags_t above.
* Merge pull request #5315 from ↵Edward Thomson2019-12-011-2/+2
|\ | | | | | | | | kastiglione/dl/fix-copypaste-in-git_cherrypick_commit-docstring Fix copy&paste in git_cherrypick_commit docstring
| * Fix copy&paste in git_cherrypick_commit docstringDave Lee2019-11-291-2/+2
| |
* | Merge pull request #5306 from herrerog/patchidPatrick Steinhardt2019-11-281-0/+1
|\ \ | | | | | | diff: complete support for git patchid
| * | diff_print: add support for GIT_DIFF_FORMAT_PATCH_ID.Gregory Herrero2019-11-191-0/+1
| |/ | | | | | | | | | | | | Git is generating patch-id using a stripped down version of a patch where hunk header and index information are not present. Signed-off-by: Gregory Herrero <gregory.herrero@oracle.com>
* | Merge pull request #5307 from palmin/hash_sha256Patrick Steinhardt2019-11-281-0/+8
|\ \ | | | | | | ssh: include sha256 host key hash when supported
| * | ssh: include sha256 host key hash when supportedAnders Borum2019-11-201-0/+8
| |/
* | Merge pull request #5123 from libgit2/ethomson/off_tPatrick Steinhardt2019-11-287-11/+16
|\ \ | | | | | | Move `git_off_t` to `git_object_size_t`
| * | odb: use `git_object_size_t` for object sizeEdward Thomson2019-11-221-1/+1
| | | | | | | | | | | | | | | Instead of using a signed type (`off_t`) use a new `git_object_size_t` for the sizes of objects.
| * | blob: use `git_object_size_t` for object sizeEdward Thomson2019-11-222-7/+7
| | | | | | | | | | | | | | | Instead of using a signed type (`off_t`) use a new `git_object_size_t` for the sizes of objects.
| * | odb: use `git_object_size_t` for object sizeEdward Thomson2019-11-222-3/+3
| | | | | | | | | | | | | | | Instead of using a signed type (`off_t`) use a new `git_object_size_t` for the sizes of objects.
| * | types: introduce `git_object_size_t`Edward Thomson2019-11-222-0/+5
| |/ | | | | | | | | Introduce `git_object_size_t`, an unsigned type that we can use for the maximum size of git objects.
* | Move deprecated git_attr_t typedef to previous attribute sectionLukas Berk2019-11-271-13/+0
| |
* | Add attr.h includeLukas Berk2019-11-271-0/+1
| |
* | Add compat typdef for git_attr_tLukas Berk2019-11-271-0/+15
|/ | | | | Some libraries haven't updated to git_attr_value_t and break. Adding the comapt typedef as suggested.
* apply: add GIT_APPLY_CHECKDrew DeVault2019-10-221-0/+12
| | | | | This adds an option which will check if a diff is applicable without actually applying it; equivalent to git apply --check.
* submodule: provide a wrapper for simple submodule clone stepsEtienne Samson2019-10-171-1/+18
|
* Merge pull request #5106 from tiennou/fix/ref-api-fixesPatrick Steinhardt2019-09-271-21/+57
|\ | | | | git_refdb API fixes
| * refdb: documentationEtienne Samson2019-09-051-21/+57
| |
* | Don't use enum for flagsSven Strickroth2019-09-264-8/+9
| | | | | | | | | | | | Using an `enum` causes trouble when used with C++ as bitwise operations are not possible w/o casting (e.g., `opts.flags &= ~GIT_BLOB_FILTER_CHECK_FOR_BINARY;` is invalid as there is no `&=` operator for `enum`). Signed-off-by: Sven Strickroth <email@cs-ware.de>
* | transport: move transport-related typedef in transport.hEtienne Samson2019-09-132-11/+11
| |
* | cert: move cert enums & struct to its own headerEtienne Samson2019-09-134-101/+132
| |
* | cred: separate public interface from low-level detailsEtienne Samson2019-09-134-306/+401
|/
* Merge pull request #5189 from libgit2/ethomson/attrs_from_headEdward Thomson2019-08-274-6/+60
|\ | | | | Optionally read `.gitattributes` from HEAD
| * blob: optionally read attributes from repositoryEdward Thomson2019-08-111-0/+6
| | | | | | | | | | | | | | When `GIT_BLOB_FILTER_ATTTRIBUTES_FROM_HEAD` is passed to `git_blob_filter`, read attributes from `gitattributes` files that are checked in to the repository at the HEAD revision. This passes the flag `GIT_FILTER_ATTRIBUTES_FROM_HEAD` to the filter functions.
| * filter: optionally read attributes from repositoryEdward Thomson2019-08-111-0/+3
| | | | | | | | | | | | | | When `GIT_FILTER_ATTRIBUTES_FROM_HEAD` is specified, configure the filter to read filter attributes from `gitattributes` files that are checked in to the repository at the HEAD revision. This passes the flag `GIT_ATTR_CHECK_INCLUDE_HEAD` to the attribute reading functions.
| * attr: optionally read attributes from repositoryEdward Thomson2019-08-111-2/+9
| | | | | | | | | | When `GIT_ATTR_CHECK_INCLUDE_HEAD` is specified, read `gitattribute` files that are checked into the repository at the HEAD revision.
| * blob: allow blob filtering to ignore system gitattributesEdward Thomson2019-08-111-0/+6
| | | | | | | | | | | | | | | | Introduce `GIT_BLOB_FILTER_NO_SYSTEM_ATTRIBUTES`, which tells `git_blob_filter` to ignore the system-wide attributes file, usually `/etc/gitattributes`. This simply passes the appropriate flag to the attribute loading code.
| * filter: add GIT_FILTER_NO_SYSTEM_ATTRIBUTES optionEdward Thomson2019-08-111-0/+3
| | | | | | | | | | | | Allow system-wide attributes (the ones specified in `/etc/gitattributes`) to be ignored if the flag `GIT_FILTER_NO_SYSTEM_ATTRIBUTES` is specified.
| * filter: document GIT_FILTER_ALLOW_UNSAFEEdward Thomson2019-08-111-0/+2
| |
| * blob: deprecate `git_blob_filtered_content`Edward Thomson2019-08-112-19/+7
| | | | | | | | Users should now use `git_blob_filter`.
| * blob: introduce git_blob_filterEdward Thomson2019-08-111-0/+39
| | | | | | | | | | Provide a function to filter blobs that allows for more functionality than the existing `git_blob_filtered_content` function.
* | Merge pull request #4913 from implausible/feature/signing-rebase-commitsPatrick Steinhardt2019-08-092-2/+40
|\ \ | | | | | | Add sign capability to git_rebase_commit
| * | documentation: add small explanation for commit signingTyler Ang-Wanek2019-07-021-1/+7
| | |
| * | fixup: code cleanup around rebase commit signingTyler Ang-Wanek2019-07-021-1/+1
| | | | | | | | | | | | | | | Use ci_git_fail_with where appropriate. Use correct initializer for callback.
| * | commit: git_commit_create_with_signature should support null signatureTyler Ang-Wanek2019-07-021-1/+2
| | | | | | | | | | | | If provided with a null signature, skip adding the signature header and create the commit anyway.
| * | Include "commit.h" in "rebase.h" for git_commit_signing_cbTyler Ang-Wanek2019-06-251-0/+1
| | |
| * | fixup: More generic signing_cb for future flexibilityTyler Wanek2019-01-242-16/+16
| | | | | | | | | | | | | | | In the case that we want to build merge + commit, cherrypick + commit, or even just build a commit with signing callback, `git_rebase_commit_signature_cb` particular callback should be made more generic. We also renamed `signature_cb` to `signing_cb` to improve clarity on the purpose of the callback (build a difference between a git_signature and the act of signing). So we've ended up with `git_commit_signing_cb`.
| * | Single callback for commit signing in rebase w/ git_bufTyler Wanek2019-01-231-26/+4
| | | | | | | | | Reduces the number of callbacks for signing a commit during a rebase operation to just one callback. That callback has 2 out git_buf parameters for signature and signature field. We use git_buf here, because we cannot make any assumptions about the heap allocator a user of the library might be using.
| * | Add signing callbacks for git_rebase_commit in git_rebase_optionsTyler Wanek2019-01-231-1/+53
| | | | | | | | | | | | 2 callbacks have been added to git_rebase_options, git_rebase_commit_signature_cb and git_rebase_commit_signature_field_cb. When git_rebase_commit_signature_cb is present in git_rebase_options, it will be called whenever git_rebase_commit is performed, giving an opportunity to sign the commit. The signing procedure can be skipped if the callback specifies passthrough as the error. The git_rebase_commit_signature_field_cb will only be called if the other callback is present or did not passthrough, and it provides means to specify which field a signature is for. Git_rebase_options was chosen as the home for these callbacks as it keeps backwards compatibility with the current rebase api.
* | | object: deprecate git_object__size for removalcmn/object-size-nopublicCarlos Martín Nieto2019-07-292-14/+12
| |/ |/| | | | | | | | | | | | | In #5118 we remove the double-underscore to make it a normally-named public function. However, this is not an interesting function outside of the library and it takes up a name for something that could be more useful. Remove the single-underscore version as we have not done any releases with it.
* | configuration: deprecate git_cvar safelyethomson/cvarEdward Thomson2019-07-181-0/+14
| |
* | configuration: cvar -> configmapPatrick Steinhardt2019-07-181-12/+12
| | | | | | | | | | `cvar` is an unhelpful name. Refactor its usage to `configmap` for more clarity.