summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* 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
| | |
* | | Merge pull request #2934 from akikoskinen/mingw_build_fixEdward Thomson2015-03-032-7/+11
|\ \ \ | | | | | | | | Fix build on mingw (master branch)
| * | | Include ws2tcpip.h in order to get in6_addrAki Koskinen2015-03-021-0/+1
| | | | | | | | | | | | | | | | It's currently required in src/openssl_stream.c only.
| * | | Include openssl headers lastAki Koskinen2015-03-021-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Windows headers #define some names that openssl uses too. Openssl headers #undef the offending names before reusing them. But if those offending Windows headers get included after the openssl headers the namespace is polluted and nothing good happens. Fixes issue #2850.
| * | | Don't include headers on windows that aren't availableAki Koskinen2015-03-021-3/+6
| |/ / | | | | | | | | | This mainly concerns mingw build.
* | | Merge pull request #2913 from ethomson/stash_fixupEdward Thomson2015-03-032-2/+20
|\ \ \ | | | | | | | | stash: correctly stash wd modified/index deleted
| * | | stash: correctly stash wd modified/index deletedEdward Thomson2015-02-182-2/+20
| | | |
* | | | Merge pull request #2808 from libgit2/cmn/repo-identEdward Thomson2015-03-0391-792/+712
|\ \ \ \ | | | | | | | | | | Remove the signature from ref-modifying functions
| * | | | Update CHANGELOG with the reflog ident changescmn/repo-identCarlos Martín Nieto2015-03-031-0/+19
| | | | |
| * | | | repository: remove log message override for switching the active branchCarlos Martín Nieto2015-03-0322-125/+141
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We want to use the "checkout: moving from ..." message in order to let git know when a change of branch has happened. Make the convenience functions for this goal write this message.
| * | | | push: remove reflog message overrideCarlos Martín Nieto2015-03-036-23/+15
| | | | | | | | | | | | | | | | | | | | We always use "update by push".
| * | | | branch: don't accept a reflog message overrideCarlos Martín Nieto2015-03-039-109/+58
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This namespace is about behaving like git's branch command, so let's do exactly that instead of taking a reflog message. This override is still available via the reference namespace.
| * | | | reset: remove reflog message overrideCarlos Martín Nieto2015-03-0314-102/+76
| | | | | | | | | | | | | | | | | | | | | | | | | This function is meant to simulate what git does in the reset command, so we should include the reflog message in that.
| * | | | Remove the signature from ref-modifying functionsCarlos Martín Nieto2015-03-0391-611/+581
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The signature for the reflog is not something which changes dynamically. Almost all uses will be NULL, since we want for the repository's default identity to be used, making it noise. In order to allow for changing the identity, we instead provide git_repository_set_ident() and git_repository_ident() which allow a user to override the choice of signature.
* | | | | Merge pull request #2885 from JIghtuse/masterCarlos Martín Nieto2015-03-031-6/+24
|\ \ \ \ \ | |/ / / / |/| | | | describe example: function to add commits to opts
| * | | | describe example: function to add commits to optsBoris Egorov2015-02-061-6/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add safe function to (a,rea)llocate memory which terminate example on memory allocation failure. Move code to allocate commits to its own function.
* | | | | Merge pull request #2908 from ethomson/safe_createCarlos Martín Nieto2015-03-0317-76/+132
|\ \ \ \ \ | | | | | | | | | | | | Allow checkout to handle newly cloned repositories, remove `GIT_CHECKOUT_SAFE_CREATE`
| * | | | | checkout tests: just use SAFE where appropriateEdward Thomson2015-02-272-9/+4
| | | | | |
| * | | | | checkout: remove `GIT_CHECKOUT_SAFE_CREATE` as a strategyEdward Thomson2015-02-2711-73/+91
| | | | | |
| * | | | | example: drop `SAFE_CREATE` from clone exampleEdward Thomson2015-02-271-1/+1
| | | | | |
| * | | | | clone: drop now unnecessary SAFE_CREATEEdward Thomson2015-02-272-2/+2
| | | | | |
| * | | | | checkout: upgrade to `SAFE_CREATE` when no index fileEdward Thomson2015-02-272-0/+43
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When the repository does not contain an index, emulate git's behavior and upgrade to `SAFE_CREATE`. This allows us to check out repositories created with `git clone --no-checkout`.
| * | | | | merge perf test: drop unnecessary SAFE_CREATEEdward Thomson2015-02-271-1/+1
| | | | | |
| * | | | | cherrypick, revert: drop unnecessary SAFE_CREATEEdward Thomson2015-02-272-2/+2
| | | | | |
* | | | | | branch: do capture the error codeCarlos Martín Nieto2015-03-031-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We want to ignore GIT_ENOTFOUND, but for that we need to capture the error code from the reflog deletion.
* | | | | | Merge pull request #2937 from git-up/branch_delete_reflogCarlos Martín Nieto2015-03-031-1/+6
|\ \ \ \ \ \ | | | | | | | | | | | | | | git_branch_delete() should ignore errors from non-existing reflogs
| * | | | | | git_branch_delete() should ignore errors from non-existing reflogsPierre-Olivier Latour2015-03-021-1/+6
| | |_|_|/ / | |/| | | |
View Lorry Controller Status