summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* commit: add function to attach a signature to a commitcmn/commit-with-signatureCarlos Martín Nieto2016-03-153-0/+185
| | | | | In combination with the function which creates a commit into a buffer, this allows us to more easily create signed commits.
* Merge pull request #3623 from ethomson/rebase_with_commitCarlos Martín Nieto2016-03-093-5/+288
|\ | | | | rebase: additional setup tests of exotic behavior
| * rebase: additional tests for completing a rebaseEdward Thomson2016-02-282-5/+83
| |
| * rebase: additional setup tests of exotic behaviorEdward Thomson2016-02-171-0/+205
| | | | | | | | | | | | | | Test some additional exotic rebase setup behavior: that we are able to set up properly when already in a detached HEAD state, that the caller specifies all of branch, upstream and onto, and that the caller specifies branch, upstream and onto by ID.
* | Merge pull request #3672 from libgit2/cmn/do-fail-appveyorCarlos Martín Nieto2016-03-091-0/+1
|\ \ | | | | | | appveyor: stop if the first test fails
| * | appveyor: stop if the first test failsCarlos Martín Nieto2016-03-091-0/+1
| | |
* | | Merge pull request #3670 from libgit2/vmg/expand-fixesEdward Thomson2016-03-092-70/+163
|\ \ \ | |/ / |/| | Fixes for `gid_odb_expand_ids`
| * | odb: Try to lookup headers in all backends before passthroughvmg/expand-fixesVicent Marti2016-03-091-5/+20
| | |
| * | odb: Refactor `git_odb_expand_ids`Vicent Marti2016-03-091-21/+26
| | |
| * | odb: Implement new helper to read types without refreshingVicent Marti2016-03-091-45/+104
| | |
| * | odb: Handle corner cases in `git_odb_expand_ids`Vicent Marti2016-03-092-22/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The old implementation had two issues: 1. OIDs that were too short as to be ambiguous were not being handled properly. 2. If the last OID to expand in the array was missing from the ODB, we would leak a `GIT_ENOTFOUND` error code from the function.
* | | Merge pull request #3668 from libgit2/cmn/mwindow-try-harderEdward Thomson2016-03-091-2/+12
|\ \ \ | |/ / |/| | mwindow: free unused windows if we fail to mmap
| * | mwindow: free unused windows if we fail to mmapcmn/mwindow-try-harderCarlos Martín Nieto2016-03-091-2/+12
|/ / | | | | | | | | | | The first time may be due to memory fragmentation or just bad luck on a 32-bit system. When we hit the mmap error for the first time, free up the unused windows and try again.
* | Merge pull request #3656 from ethomson/exists_prefixesVicent Marti2016-03-088-37/+297
|\ \ | | | | | | Introduce `git_odb_expand_ids`
| * | git_odb_expand_ids: accept git_odb_expand_id arrayEdward Thomson2016-03-083-92/+89
| | | | | | | | | | | | Take (and write to) an array of a struct, `git_odb_expand_id`.
| * | git_odb_expand_ids: rename func, return the typeEdward Thomson2016-03-083-32/+49
| | |
| * | git_odb_exists_many_prefixes: query odb for multiple short idsEdward Thomson2016-03-074-13/+249
| | | | | | | | | | | | | | | Query the object database for multiple objects at a time, given their object ID (which may be abbreviated) and optional type.
| * | odb: improved not found error messagesEdward Thomson2016-03-075-24/+34
| | | | | | | | | | | | | | | When looking up an abbreviated oid, show the actual (abbreviated) oid the caller passed instead of a full (but ambiguously truncated) oid.
* | | Merge pull request #3555 from cbargren/ssh-git-protocolsEdward Thomson2016-03-084-19/+49
|\ \ \ | | | | | | | | Support for ssh+git and git+ssh protocols
| * | | TabsChris Bargren2015-12-281-2/+2
| | | |
| * | | Adding test cases that actually test the functionality of the new transportChris Bargren2015-12-281-0/+6
| | | | | | | | | | | | ssh, ssh+git and git+ssh should all successfully build an SSH transport
| * | | Removing #define for SSH_PREFIX_COUNT and using ARRAY_SIZE insteadChris Bargren2015-12-281-6/+5
| | | | | | | | | | | | Also moving var declarations to top of blocks to support bad old compilers
| * | | Updating change to http_parser to reflect PR for nodejs/http-parserChris Bargren2015-12-281-2/+5
| | | | | | | | | | | | The parser now also supports digits, '-' and '.'. https://github.com/nodejs/http-parser/pull/276
| * | | Adding spec coverage for ssh+git and git+ssh protocolsChris Bargren2015-12-221-0/+4
| | | |
| * | | Handle git+ssh:// and ssh+git:// protocols supportChris Bargren2015-12-222-17/+35
| | | |
| * | | Updating http parser to accept a `+` in the schemaChris Bargren2015-12-221-1/+1
| | | |
* | | | Merge pull request #3652 from libgit2/cmn/commit-to-memoryEdward Thomson2016-03-084-47/+216
|\ \ \ \ | | | | | | | | | | commit: split creating the commit and writing it out
| * | | | commit: split creating the commit and writing it outcmn/commit-to-memoryCarlos Martín Nieto2016-03-084-47/+216
| | |/ / | |/| | | | | | | | | | | | | | | | | | Sometimes you want to create a commit but not write it out to the objectdb immediately. For these cases, provide a new function to retrieve the buffer instead of having to go through the db.
* | | | Merge pull request #3655 from ethomson/nanosecond_defaultsCarlos Martín Nieto2016-03-084-31/+66
|\ \ \ \ | | | | | | | | | | Enable nanosecond resolution by default
| * | | | index::racy: force racy entryEdward Thomson2016-03-081-19/+12
| | | | | | | | | | | | | | | | | | | | | | | | | Instead of hoping that we can get a racy entry by going real fast and praying real hard, just create a racy entry.
| * | | | index::nsec: don't expect shit filesystems to not suckEdward Thomson2016-03-071-9/+51
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If the underlying filesystem doesn't support better than one second resolution, then don't expect that turning on `GIT_USE_NSEC` does anything magical to change that.
| * | | | merge::workdir::dirty: update to use `st_ctime_nsec`Edward Thomson2016-03-071-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | Update unit test to use newfangled `st_ctime_nsec`, which provides indirection to the platform-correct name.
| * | | | Enable nanosecond resolution by defaultEdward Thomson2016-03-031-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | Nanosecond resolution is now the default in git itself. Enable this as our default as well.
* | | | | Merge pull request #3658 from patrickmckenna/update-pro-git-linkEdward Thomson2016-03-081-3/+2
|\ \ \ \ \ | |_|/ / / |/| | | | Update link to Pro Git's Git internals chapter
| * | | | Update link to Pro Git's Git internals chapter.Patrick McKenna2016-03-071-3/+2
|/ / / /
* | | | Merge pull request #3653 from libgit2/cmn/treebuilder-submodulev0.24.0Edward Thomson2016-03-042-1/+14
|\ \ \ \ | | | | | | | | | | treebuilder: don't try to verify submodules exist in the odb
| * | | | treebuilder: don't try to verify submodules exist in the odbcmn/treebuilder-submoduleCarlos Martín Nieto2016-03-042-1/+14
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | Submodules don't exist in the objectdb and the code is making us try to look for a blob with its commit id, which is obviously not going to work. Skip the test if the user wants to insert a submodule.
* | | | Merge pull request #3651 from libgit2/cmn/init-libssh2Edward Thomson2016-03-033-1/+31
|\ \ \ \ | | | | | | | | | | ssh: initialize libssh2
| * | | | ssh: initialize libssh2cmn/init-libssh2Carlos Martín Nieto2016-03-033-1/+31
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | We should have been doing this, but it initializes itself upon first use, which works as long as nobody's doing concurrent network operations. Initialize it on our init to make sure it's not getting initialized concurrently.
* | | | Merge pull request #3639 from srajko/threading-openssl-libssh2Carlos Martín Nieto2016-03-031-5/+11
|\ \ \ \ | |/ / / |/| | | Expand OpenSSL and libssh2 thread safety documentation
| * | | Expand OpenSSL and libssh2 thread safety documentationStjepan Rajko2016-02-261-5/+11
| | | |
* | | | tests: take the version from our defineCarlos Martín Nieto2016-03-031-1/+1
| | | |
* | | | Bump version to 0.24.0Carlos Martín Nieto2016-03-031-3/+3
| | | |
* | | | CHANGELOG: prepre tamplate for releaseCarlos Martín Nieto2016-03-031-1/+14
| | | |
* | | | CHANGELOG: add note about WinHTTP cred handlingCarlos Martín Nieto2016-03-031-0/+3
| | | |
* | | | Merge pull request #3648 from libgit2/cmn/auth-retryCarlos Martín Nieto2016-03-034-4/+17
|\ \ \ \ | | | | | | | | | | test: make sure we retry the auth callback on all platforms
| * | | | tests: create a ctest target for cred_callbackcmn/auth-retryCarlos Martín Nieto2016-03-033-4/+8
| | | | |
| * | | | winhttp: retry authenticationCarlos Martín Nieto2016-03-031-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If the caller has provided bad authentication, give them another apportunity to get it right until they give up. This brings WinHTTP in line with the other transports.
| * | | | test: make sure we retry the auth callback on all platformsCarlos Martín Nieto2016-03-032-1/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We were missing this test on Windows, which meant we didn't notice that we never fixed the single authentication attempt it tries, nor its wrong return code. Enable this for the unix platforms as well over HTTP. We previously were doing it locally but disabled it on OS X due to issues with its sshd not accepting password authentication.
* | | | | Merge pull request #3646 from pks-t/pks/xdiff-fix-from-upstreamCarlos Martín Nieto2016-03-031-2/+5
|\ \ \ \ \ | |/ / / / |/| | | | xdiff: fix memleak on error case
View Lorry Controller Status