summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* 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.
* 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
| | |_|_|/ | |/| | |
* | | | | Merge pull request #2935 from ethomson/dll_patchlevelCarlos Martín Nieto2015-03-022-2/+3
|\ \ \ \ \ | |/ / / / |/| | | | win32: add the patch level to the .dll fileversion
| * | | | win32: add the patch level to the .dll fileversionEdward Thomson2015-03-022-2/+3
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Win32 DLLs have four fields for the version number (major, minor, teeny, patch). If a consumer wants to build a custom DLL, it may be useful to set the patchlevel version number in the DLL. This value only affects the DLL version number, it does not affect the resultant "version number", which remains major.minor.teeny.
* | | | Merge pull request #2929 from ethomson/clar_updateCarlos Martín Nieto2015-03-012-0/+75
|\ \ \ \ | | | | | | | | | | Update to clar 2b73f5e
| * | | | Update to clar 2b73f5eEdward Thomson2015-02-272-0/+75
| |/ / /
* | | | Merge pull request #2928 from ethomson/rebase_alloc_checkCarlos Martín Nieto2015-03-011-0/+1
|\ \ \ \ | | | | | | | | | | rebase: check alloc result
| * | | | rebase: check alloc resultEdward Thomson2015-02-271-0/+1
| |/ / /
* | | | Merge pull request #2922 from ethomson/more_explaining_threads_is_more_betterEdward Thomson2015-02-271-1/+4
|\ \ \ \ | |/ / / |/| | | README: provide some more explanation about TLS
| * | | README: provide some more explanation about TLSEdward Thomson2015-02-231-1/+4
|/ / /
* | | Merge pull request #2921 from libgit2/ntk/macosx_build_cherrypickedCarlos Martín Nieto2015-02-201-1/+1
|\ \ \ | | | | | | | | Fix MAX 32 bit build problem described in libgit2/libgit2#2917
| * | | Fix MAX 32 bit build problem described in libgit2/libgit2#2917ntk/macosx_build_cherrypickedJeff Hostetler2015-02-201-1/+1
|/ / /
* | | Merge pull request #2907 from jasonhaslam/git_packfile_unpack_raceCarlos Martín Nieto2015-02-201-2/+9
|\ \ \ | | | | | | | | Fix race in git_packfile_unpack.
| * | | Fix race in git_packfile_unpack.Jason Haslam2015-02-141-2/+9
| | |/ | |/| | | | | | | | | | | | | Increment refcount of newly added cache entries just like existing entries looked up from the cache. Otherwise the new entry can be evicted from the cache and destroyed while it's still in use.
* | | Merge pull request #2911 from ethomson/streaming_filtersCarlos Martín Nieto2015-02-1920-171/+728
|\ \ \ | | | | | | | | Streaming filters
| * | | tests: separate INVASIVE filesystem testsEdward Thomson2015-02-194-3/+5
| | | | | | | | | | | | | | | | | | | | | | | | Introduce GITTEST_INVASIVE_FS_STRUCTURE for things that are invasive to your filesystem structure (like creating folders at your filesystem root) and GITTEST_INVASIVE_FS_SIZE for things that write lots of data.
| * | | filter: take `temp_buf` in `git_filter_options`Edward Thomson2015-02-193-13/+9
| | | |
| * | | filter: add `git_filter_list__load_ext`Edward Thomson2015-02-193-16/+32
| | | | | | | | | | | | | | | | | | | | Refactor `git_filter_list__load_with_attr_reader` into `git_filter_list__load_ext`, which takes a `git_filter_options`.
| * | | git_filter_opt_t -> git_filter_flag_tEdward Thomson2015-02-1911-27/+27
| | | | | | | | | | | | | | | | | | | | For consistency with the rest of the library, where an opt is an options *structure*.
| * | | buffer: introduce git_buf_attach_notownedEdward Thomson2015-02-196-37/+35
| | | | | | | | | | | | | | | | | | | | | | | | Provide a convenience function that creates a buffer that can be provided to callers but will not be freed via `git_buf_free`, so the buffer creator maintains the allocation lifecycle of the buffer's contents.
| * | | checkout: let the stream writer close the fdEdward Thomson2015-02-181-2/+1
| | | |
| * | | filter streams: base -> parentEdward Thomson2015-02-182-12/+12
| | | |
| * | | git_writestream: from git_filter_streamEdward Thomson2015-02-186-51/+51
| | | |
| * | | filter: test a large file through the streamEdward Thomson2015-02-171-0/+221
| | | | | | | | | | | | | | | | | | | | Test pushing a file on-disk into a streaming filter that compresses it into the ODB, and inflates it back into the working directory.
View Lorry Controller Status