summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* local: let the packbuilder perform smarter object insertioncmn/pack-objects-walkCarlos Martín Nieto2015-03-111-32/+10
| | | | | | | | | | Currently we use the most naïve and inefficient method for figuring out which objects to send to the remote whereby we end up trying to insert subdirs which have not changed multiple times. Instead, make use of the packbuilder's built-in more efficient method which uses the walk to feed the object list and avoids inserting an object and its descendants.
* pack-objects: fill a packbuilder from a walkCarlos Martín Nieto2015-03-113-1/+265
| | | | | | | | | | | Most use-cases for the object packer communicate in terms of commits which each side has. We already have an object to specify this relationship between commits, namely git_revwalk. By knowing which commits we want to pack and which the other side already has, we can perform similar optimisations to git, by marking each tree as interesting or uninteresting only once, and not sending those trees which we know the other side has.
* Reorder some khash declarationsCarlos Martín Nieto2015-03-117-4/+13
| | | | | | Keep the definitions in the headers, while putting the declarations in the C files. Putting the function definitions in headers causes them to be duplicated if you include two headers with them.
* 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
|/ /
* | Merge pull request #2886 from jeffhostetler/jeffhostetler/clar_traceCarlos Martín Nieto2015-03-047-1/+325
|\ \ | | | | | | Set up git_trace in clar test suite.
| * | Converted cl_perf_timer to use git__timer internally.Jeff Hostetler2015-03-032-76/+11
| | |
| * | Added cl_perf_timer. Updated global trace to include timers.Jeff Hostetler2015-03-024-2/+153
| | |
| * | Cleanup formatting of clar trace messages.Jeff Hostetler2015-03-021-7/+7
| | |
| * | Provide mechanism to let CLAR globally setup git_trace()Jeff Hostetler2015-03-025-1/+239
| | |
* | | Merge pull request #2945 from ethomson/empty_hashsig_heapCarlos Martín Nieto2015-03-042-1/+116
|\ \ \ | | | | | | | | diff_tform: don't compare empty hashsig_heaps
| * | | diff_tform: account for whitespace optionsEdward Thomson2015-03-042-10/+84
| | | | | | | | | | | | | | | | | | | | When comparing seemingly blank files, take whitespace options into account.
| * | | diff_tform: don't compare empty hashsig_heapsEdward Thomson2015-03-032-0/+41
| | | | | | | | | | | | | | | | Don't try to compare two empty hashsig_heaps.
* | | | Plug a few leaksCarlos Martín Nieto2015-03-047-7/+19
| | | |
* | | | Merge pull request #2941 from libgit2/cmn/http-enforce-credEdward Thomson2015-03-031-0/+5
|\ \ \ \ | | | | | | | | | | http: enforce the credential types
| * | | | http: enforce the credential typescmn/http-enforce-credCarlos Martín Nieto2015-03-031-0/+5
| |/ / / | | | | | | | | | | | | | | | | | | | | The user may decide to return any type of credential, including ones we did not say we support. Add a check to make sure the user returned an object of the right type and error out if not.
* | | | Merge pull request #2771 from libgit2/cmn/config-borrow-entryEdward Thomson2015-03-0335-318/+446
|\ \ \ \ | |/ / / |/| | | Borrowing configuration entries
| * | | config: borrow refcounted referencescmn/config-borrow-entryCarlos Martín Nieto2015-03-0335-318/+446
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This changes the get_entry() method to return a refcounted version of the config entry, which you have to free when you're done. This allows us to avoid freeing the memory in which the entry is stored on a refresh, which may happen at any time for a live config. For this reason, get_string() has been forbidden on live configs and a new function get_string_buf() has been added, which stores the string in a git_buf which the user then owns. The functions which parse the string value takea advantage of the borrowing to parse safely and then release the entry.
* | | Remove swp filesCarlos Martín Nieto2015-03-032-0/+0
| | |
View Lorry Controller Status