summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* cmake: include threading libraries in pkg-configethomson/cmake_pcEdward Thomson2016-04-291-0/+2
| | | | Include any required threading libraries in our `libgit2.pc`.
* Merge pull request #3763 from libgit2/ethomson/signature_from_bufferCarlos Martín Nieto2016-04-293-1/+52
|\ | | | | Introduce `git_signature_from_buffer`
| * Introduce `git_signature_from_buffer`ethomson/signature_from_bufferEdward Thomson2016-04-283-1/+52
| | | | | | | | | | Allow users to construct a signature from the type of signature lines that actually appear in commits.
* | Merge pull request #3760 from backhub/bug/openssl_readEdward Thomson2016-04-281-1/+1
|\ \ | |/ |/| Fix return value of openssl_read (infinite loop)
| * Fix style: no bracesChristian Schlack2016-04-271-2/+1
| |
| * Fix return value of openssl_read (infinite loop)Christian Schlack2016-04-261-2/+3
| | | | | | | | | | | | | | | | | | | | openssl_read should return -1 in case of error. SSL_read returns values <= 0 in case of error. A return value of 0 can lead to an infinite loop, so the return value of ssl_set_error will be returned if SSL_read is not successful (analog to openssl_write).
* | Merge pull request #3758 from libgit2/ethomson/annotated_commit_refsCarlos Martín Nieto2016-04-266-85/+127
|\ \ | |/ |/| Annotated commits: differentiate between the ref names and the description
| * annotated_commit: provide refs and descriptionethomson/annotated_commit_refsEdward Thomson2016-04-265-85/+108
| | | | | | | | | | | | | | | | | | | | | | Differentiate between the ref_name used to create an annotated_commit (that can subsequently be used to look up the reference) and the description that we resolved this with (which _cannot_ be looked up). The description is used for things like reflogs (and may be a ref name, and ID something that we revparsed to get here), while the ref name must actually be a reference name, and is used for things like rebase to return to the initial branch.
| * rebase::abort: test we can abort rebase by revspecEdward Thomson2016-04-261-0/+19
|/ | | | | Test that we can properly abort a rebase when it is initialized by a revspec. This ensures that we do not conflate revspecs and refnames.
* Merge pull request #3755 from arthurschreiber/patch-9Carlos Martín Nieto2016-04-261-41/+0
|\ | | | | Remove traces of `git_blob_create_fromchunks`
| * Remove traces of `git_blob_create_fromchunks`Arthur Schreiber2016-04-261-41/+0
|/
* Merge pull request #3749 from arthurschreiber/arthur/add-git-reference-dupCarlos Martín Nieto2016-04-263-1/+64
|\ | | | | Allow creating copies of `git_reference` objects.
| * Allow creating copies of `git_reference` objects.Arthur Schreiber2016-04-223-1/+64
| |
* | Merge pull request #3748 from libgit2/ethomson/rebase_detachedCarlos Martín Nieto2016-04-263-32/+161
|\ \ | | | | | | Rebase improvements with IDs
| * | rebase: correctly finish rebasing detached headsethomson/rebase_detachedEdward Thomson2016-04-212-24/+85
| | | | | | | | | | | | | | | When rebasing with IDs, we do not return to the `branch`, we remain in a detached HEAD state.
| * | rebase: handle detached HEADs in `init`Edward Thomson2016-04-211-3/+11
| | | | | | | | | | | | | | | | | | When `init`ing a rebase from a detached HEAD, be sure to remember that we were in a detached HEAD state so that we can correctly `abort` the object that we just created.
| * | rebase: test abort immediately after initEdward Thomson2016-04-211-5/+65
| |/ | | | | | | | | Instead of `open`ing a rebase and `abort`ing that, test that we can `abort` a rebase that has just begun with `init`.
* | Merge pull request #3752 from libgit2/cmn/silly-tagsEdward Thomson2016-04-252-2/+45
|\ \ | | | | | | tag: ignore extra header fields
| * | tag: ignore extra header fieldscmn/silly-tagsCarlos Martín Nieto2016-04-252-2/+45
|/ / | | | | | | | | | | | | While no extra header fields are defined for tags, git accepts them by ignoring them and continuing the search for the message. There are a few tags like this in the wild which git parses just fine, so we should do the same.
* | Merge pull request #3747 from libgit2/ethomson/warningsCarlos Martín Nieto2016-04-224-8/+11
|\ \ | |/ |/| :zap: some warnings
| * clone test: annotate unused varsEdward Thomson2016-04-211-1/+3
| |
| * transport: cast away constness for freeEdward Thomson2016-04-211-1/+1
| |
| * stransport: pass proxy opts instead of char*Edward Thomson2016-04-211-2/+4
| |
| * iterator: ignore submodule in has_endedEdward Thomson2016-04-211-4/+3
|/
* Merge pull request #3110 from libgit2/cmn/proxy-configEdward Thomson2016-04-1930-71/+574
|\ | | | | Proxy configuration
| * CI: download the proxy jar also on mingwcmn/proxy-configCarlos Martín Nieto2016-04-191-2/+3
| | | | | | | | | | | | We were downloading the jar from within an block which only runs for MSVC. Move the download to the start of the test so it gets downloaded for both.
| * CI: run proxy tests with ctestCarlos Martín Nieto2016-04-192-2/+4
| | | | | | | | | | Running clar directly on appveyor makes it think the command returned failure, so it stops the tests. Running it via ctest lets it go through.
| * proxy: don't specify the protocol in the typeCarlos Martín Nieto2016-04-194-14/+9
| | | | | | | | | | | | We leave this up to the scheme in the url field. The type should only tell us about whether we want a proxy and whether we want to auto-detect it.
| * CI: start the proxy before the build so it's readyCarlos Martín Nieto2016-04-192-9/+10
| | | | | | | | | | | | It takes a bit for the propxy to get ready to accept connections, so start it before the build so we can be reasonably sure that it's going to be ready in time.
| * winhttp: correctly detect HTTPS usageCarlos Martín Nieto2016-04-191-2/+14
| |
| * curl: ask for proxy credentialsCarlos Martín Nieto2016-04-191-4/+81
| |
| * proxy: add a payload field for the proxy optionsCarlos Martín Nieto2016-04-192-0/+22
| | | | | | | | | | I don't quite recall what we do in the other places where we use this, but we should pass this payload to the callbacks.
| * net: use proxy options struct in the stream configCarlos Martín Nieto2016-04-195-16/+46
| |
| * proxy: don't require the trailing slash on WinHTTPCarlos Martín Nieto2016-04-192-3/+4
| | | | | | | | | | The path is not something that you use for proxies, so make use of the new optionality of the path when extracting URL parts.
| * proxy: test proxy support on TravisCarlos Martín Nieto2016-04-191-0/+14
| |
| * netops: make the path optional in URLsCarlos Martín Nieto2016-04-192-10/+21
| | | | | | | | | | | | When we're dealing with proxy addresses, we only want a hostname and port, and the user would not provide a path, so make it optional so we can use this same function to parse git as well as proxy URLs.
| * proxy: use poxy to test our Windows proxy supportCarlos Martín Nieto2016-04-193-1/+11
| |
| * proxy: ask the user for credentials if necessaryCarlos Martín Nieto2016-04-1917-41/+260
| |
| * proxy: introduce a proxy options structCarlos Martín Nieto2016-04-193-0/+108
| | | | | | | | It is currently unused; it will go into the remote's options.
* | Merge pull request #3745 from libgit2/cmn/ignore-starstarEdward Thomson2016-04-192-5/+44
|\ \ | |/ |/| Improve star-star matching
| * ignore: move star-star matching closer to it usecmn/ignore-starstarCarlos Martín Nieto2016-04-191-16/+11
| | | | | | | | | | Instead of threading the state down to the larger loop, let's have the loop where we detect the double star so each of them are easier to read.
| * ignore: fix directory limits when searching for star-starCarlos Martín Nieto2016-04-192-6/+36
| | | | | | | | | | | | | | | | | | | | | | | | In order to match the star-star, we disable the flag that's looking for a single path element, but that leads to searching for the pattern in the middle of elements in the input string. Mark when we're handing a star-star so we jump over the elements in our attempt to match the part of the pattern that comes after the star-star. While here, tighten up the check so we don't allow invalid rules through.
| * Add more tests for path matching with globs and path delimitersAntonio Scandurra2016-04-181-0/+14
|/
* Merge pull request #3740 from Qix-/patch-1Carlos Martín Nieto2016-04-131-1/+1
|\ | | | | Add missing ')' to callbacks documentation
| * Add missing ')' to callbacks documentationJosh Junon2016-04-121-1/+1
|/ | | | | Super minor, but it was bugging me. There was a missing closing paren in the docs.
* Merge pull request #3738 from ethomson/test_as_rootCarlos Martín Nieto2016-04-122-0/+8
|\ | | | | tests: skip the unreadable file tests as root
| * tests: skip the unreadable file tests as rootEdward Thomson2016-04-112-0/+8
|/ | | | | | When running as root, skip the unreadable file tests, because, well, they're probably _not_ unreadable to root unless you've got some crazy NSA clearance-level honoring operating system shit going on.
* Merge pull request #3736 from libgit2/cmn/dwim-general-messageEdward Thomson2016-04-112-0/+11
|\ | | | | refs: provide a more general error message for dwim
| * refs: provide a more general error message for dwimcmn/dwim-general-messageCarlos Martín Nieto2016-04-112-0/+11
| | | | | | | | | | | | | | If we cannot dwim the input, set the error message to be explicit about that. Otherwise we leave the error for the last failed lookup, which can be rather unexpected as it mentions a remote when the user thought they were trying to look up a branch.
* | Merge pull request #3737 from ethomson/strict-objectCarlos Martín Nieto2016-04-112-8/+8
|\ \ | |/ |/| Strict object creation in `refs::create`