summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* http: do not try to use the cert callback on unencrypted streamscmn/stream-check-ecCarlos Martín Nieto2015-03-162-1/+7
| | | | | | | | | When the user has a certificate check callback set, we still have to check whether the stream we're using is even capable of providing a certificate. In the case of an unencrypted certificate, do not ask for it from the stream, and do not call the callback.
* Add failing test for cert callback with non-ecrypted streamCarlos Martín Nieto2015-03-161-0/+7
| | | | | | When we have an HTTP stream and have set the certificatre check callback, we currently fail as we ask the unencrypted stream for its certificate.
* Merge pull request #2975 from git-up/diff_index_retainCarlos Martín Nieto2015-03-151-2/+1
|\ | | | | Avoid retaining / releasing the index more than necessary when GIT_DIFF_...
| * Avoid retaining / releasing the index more than necessary when ↵Pierre-Olivier Latour2015-03-111-2/+1
| | | | | | | | GIT_DIFF_UPDATE_INDEX is enabled
* | indexer: bring back the error message on duplcate commitsCarlos Martín Nieto2015-03-131-0/+7
| | | | | | | | | | | | | | | | It turns out that erroring out on duplicate commits is the right thing to do, but git was not hitting the bug on the server-side. Bring back a descriptive error message in case of duplicate entries and error out.
* | indexer: don't worry about duplicate objectsCarlos Martín Nieto2015-03-131-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | If a packfile includes duplicate objects, we can choose to use the secon copy instead of the first by using the same logic as if it were the first. Change the error condition from 0 to -1, which indicates a bad resize, and set the OOM message in that case. This does mean we will leak the first copy of the object. We can deal with that later, but making fetches work is more important.
* | indexer: set an error message on duplicate objects in packCarlos Martín Nieto2015-03-131-0/+1
| | | | | | | | | | | | While this is not even close to a fix, we can at least set an error message so we know which error we are facing. Up to know we just returned an error without a message.
* | Put back the number of expected references to 6 from the test repoCarlos Martín Nieto2015-03-131-3/+3
| | | | | | | | | | | | | | This was but down to 5 when GitHub made a change to their server which made them stop honouring the include-tag request. This has recently been corrected, so we can bring it back up to six.
* | Merge pull request #2973 from libgit2/cmn/local-pack-threadingEdward Thomson2015-03-122-0/+6
|\ \ | |/ |/| local: create pack with multiple threads
| * local: create pack with multiple threadscmn/local-pack-threadingCarlos Martín Nieto2015-03-112-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | The default behaviour for the packbuilder is to perform the work in a single thread, which is fine for the public API, but we currently have no way for a user to determine the number of threads to use when creating the packfile, which makes our clone behaviour over the filesystem quite a bit slower than what git offers. This is a very particular scenario, in which we avoid spawning git by being ourselves the server-side, so it's probably ok to auto-set the threading, as the upload-pack process would do if we were talking to git.
* | Merge commit 'refs/pull/2879/head' of ssh://github.com/libgit2/libgit2Carlos Martín Nieto2015-03-114-8/+209
|\ \ | |/ |/|
| * Add API to add a memory buffer to an indexDamien PROFETA2015-02-254-8/+209
| | | | | | | | | | | | git_index_add_frombuffer enables now to store a memory buffer in the odb and to store an entry in the index directly if the index is attached to a repository.
* | Merge pull request #2969 from adrienthebo/remote_add_invalid_refspecCarlos Martín Nieto2015-03-111-0/+3
|\ \ | | | | | | refspec: report errors when parsing an invalid refspec
| * | refspec: set err message on invalid refspecAdrien Thebo2015-03-101-0/+3
| | | | | | | | | | | | | | | | | | | | | If a refspec could not be parsed, the git_refspec__parse function would return an error value but would not provide additional error information for the callers. This commit amends that function to set a more useful error message.
* | | Merge pull request #2970 from ethomson/inmemory_bareCarlos Martín Nieto2015-03-112-1/+34
|\ \ \ | | | | | | | | "In-memory" repos are bare by default
| * | | repository_new: test its barenessEdward Thomson2015-03-101-0/+27
| | | |
| * | | repository: in-memory repos are bare by defaultEdward Thomson2015-03-101-1/+7
| | | |
* | | | Merge pull request #2971 from ethomson/revert_fastfailCarlos Martín Nieto2015-03-114-16/+2
|\ \ \ \ | |_|/ / |/| | | Revert "fastfail" from the mingw PR
| * | | Revert "add fast-fail feature for pending builds in PR's"Edward Thomson2015-03-101-4/+0
| | | | | | | | | | | | | | | | This reverts commit 8008ab6a4158416d095212c9782fa1622ef994a5.
| * | | Revert "Implement fail-fast for Travis as well"Edward Thomson2015-03-103-12/+2
|/ / / | | | | | | | | | This reverts commit ba6c53b91b1d9c9dc49b7c0d8e8efbd9842c31dc.
* | | Merge pull request #2964 from git-up/fixesEdward Thomson2015-03-092-2/+2
|\ \ \ | | | | | | | | Fixes
| * | | Removed unnecessary GIT_CHECKOUT_SKIP_UNMERGED for GIT_RESET_HARDPierre-Olivier Latour2015-03-081-1/+1
| | | |
| * | | Fixed build warningPierre-Olivier Latour2015-03-081-1/+1
| | | |
* | | | Merge pull request #2946 from tkelman/appveyor-mingwEdward Thomson2015-03-0910-8/+74
|\ \ \ \ | |/ / / |/| | | RFC: add mingw to appveyor matrix
| * | | Use secure API if available.Matti Virolainen2015-03-061-1/+1
| | | |
| * | | Add some missing definitions for mingw.orgTony Kelman2015-03-061-0/+7
| | | | | | | | | | | | | | | | these shouldn't be necessary if _WIN32_WINNT >= _WIN32_WINNT_VISTA
| * | | Move definitions of strcasecmp and strncasecmp to msvc-compat.hTony Kelman2015-03-062-2/+3
| | | | | | | | | | | | | | | | should cut down on compiler warnings with mingw
| * | | Allow failures on mingw for nowTony Kelman2015-03-051-0/+4
| | | |
| * | | Only run -ionline tests IF (WINHTTP OR OPENSSL_FOUND)Tony Kelman2015-03-051-1/+5
| | | |
| * | | Add MinGW-w64 to matrixTony Kelman2015-03-042-4/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | cache mingw-w64 downloads quiet curl and 7zip run appveyor steps in cmd for mingw
| * | | Implement fail-fast for Travis as wellTony Kelman2015-03-043-2/+12
| | | |
| * | | add fast-fail feature for pending builds in PR'sTony Kelman2015-03-041-0/+4
| | | |
| * | | add mingw to appveyor matrixTony Kelman2015-03-042-2/+14
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | use MSYS makefiles generator add bash script for running mingw on appveyor add --login and fix run paths use msys style path to appveyor-mingw.sh add mingw path to /etc/fstab
* | | Merge pull request #2963 from libgit2/cmn/rename-reflogCarlos Martín Nieto2015-03-083-1/+7
|\ \ \ | | | | | | | | refdb: use the same id for old and new when renaming a reference
| * | | refdb: use the same id for old and new when renaming a referencecmn/rename-reflogCarlos Martín Nieto2015-03-083-1/+7
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | When we rename a reference, we want the old and new ids to be the same one (as we did not change it). The normal code path looks up the old id from the current value of the brtanch, but by the time we look it up, it does not exist anymore and thus we write a zero id. Pass the old id explicitly instead.
* | | Merge pull request #2961 from ethomson/filter_relative_pathsEdward Thomson2015-03-062-2/+98
|\ \ \ | | | | | | | | Filter relative paths
| * | | filter: accept relative paths in apply_to_fileEdward Thomson2015-03-061-1/+1
| | | |
| * | | filter::file tests: test filter_list_apply_to_fileEdward Thomson2015-03-061-0/+97
| | | | | | | | | | | | | | | | | | | | Test that filter_list_apply_to_file works and can accept repo-relative paths.
| * | | filter: drop old TODOEdward Thomson2015-03-061-1/+0
| |/ /
* | | Merge pull request #2950 from libgit2/ntk/reflog_branch_createCarlos Martín Nieto2015-03-063-5/+5
|\ \ \ | |/ / |/| | branch: fix generated reflog message upon creation
| * | Drop trailing whitespacesntk/reflog_branch_createnulltoken2015-03-041-1/+1
| | |
| * | branch: fix generated reflog message upon renamingnulltoken2015-03-042-2/+2
| | |
| * | branch: fix generated reflog message upon creationnulltoken2015-03-042-2/+2
|/ /
* | Merge pull request #2932 from jeffhostetler/jeffhostetler/big_clone_crashCarlos Martín Nieto2015-03-043-5/+69
|\ \ | | | | | | Fix crash in git_clone on extremely large repos
| * | Change ifdef for MINGW32.Jeff Hostetler2015-03-031-4/+2
| | |
| * | Fix p_ftruncate to handle big files for git_cloneJeff Hostetler2015-03-033-4/+70
| | |
* | | Merge branch 'tls_data'Carlos Martín Nieto2015-03-042-10/+38
|\ \ \
| * | | libgit2_shutdown: free TLS data (win32)Edward Thomson2015-03-041-0/+11
| | | | | | | | | | | | | | | | Free TLS data on thread exit (win32)
| * | | libgit2_shutdown: clear err message on shutdownEdward Thomson2015-03-042-10/+27
| | | | | | | | | | | | | | | | | | | | | | | | Clear the error message on git_libgit2_shutdown for all versions of the library (no threads and Win32 threads). Drop the giterr_clear in clar, as that shouldn't be necessary.
| * | | Fix leak of TLS error message in shutdown (ptherad version)Leo Yang2015-03-041-3/+3
|/ / /
View Lorry Controller Status