summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* http: do not try to use the cert callback on unencrypted streamscmn/stream-check-ecCarlos Martín Nieto2015-03-162-1/+7
* Add failing test for cert callback with non-ecrypted streamCarlos Martín Nieto2015-03-161-0/+7
* 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_UPDAT...Pierre-Olivier Latour2015-03-111-2/+1
* | indexer: bring back the error message on duplcate commitsCarlos Martín Nieto2015-03-131-0/+7
* | indexer: don't worry about duplicate objectsCarlos Martín Nieto2015-03-131-2/+2
* | indexer: set an error message on duplicate objects in packCarlos Martín Nieto2015-03-131-0/+1
* | Put back the number of expected references to 6 from the test repoCarlos Martín Nieto2015-03-131-3/+3
* | Merge pull request #2973 from libgit2/cmn/local-pack-threadingEdward Thomson2015-03-122-0/+6
|\ \ | |/ |/|
| * local: create pack with multiple threadscmn/local-pack-threadingCarlos Martín Nieto2015-03-112-0/+6
* | 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
* | Merge pull request #2969 from adrienthebo/remote_add_invalid_refspecCarlos Martín Nieto2015-03-111-0/+3
|\ \
| * | refspec: set err message on invalid refspecAdrien Thebo2015-03-101-0/+3
* | | Merge pull request #2970 from ethomson/inmemory_bareCarlos Martín Nieto2015-03-112-1/+34
|\ \ \
| * | | 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 "add fast-fail feature for pending builds in PR's"Edward Thomson2015-03-101-4/+0
| * | | Revert "Implement fail-fast for Travis as well"Edward Thomson2015-03-103-12/+2
|/ / /
* | | Merge pull request #2964 from git-up/fixesEdward Thomson2015-03-092-2/+2
|\ \ \
| * | | 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
|\ \ \ \ | |/ / / |/| | |
| * | | Use secure API if available.Matti Virolainen2015-03-061-1/+1
| * | | Add some missing definitions for mingw.orgTony Kelman2015-03-061-0/+7
| * | | Move definitions of strcasecmp and strncasecmp to msvc-compat.hTony Kelman2015-03-062-2/+3
| * | | 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
| * | | 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
| |/ /
* | | 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 referencecmn/rename-reflogCarlos Martín Nieto2015-03-083-1/+7
|/ / /
* | | Merge pull request #2961 from ethomson/filter_relative_pathsEdward Thomson2015-03-062-2/+98
|\ \ \
| * | | 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
| * | | 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
|\ \ \ | |/ / |/| |
| * | 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
|\ \
| * | 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
| * | | libgit2_shutdown: clear err message on shutdownEdward Thomson2015-03-042-10/+27
| * | | Fix leak of TLS error message in shutdown (ptherad version)Leo Yang2015-03-041-3/+3
|/ / /