summaryrefslogtreecommitdiff
path: root/src
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-031-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-031-2/+1
|\ \ | | | | | | stash: correctly stash wd modified/index deleted
| * | stash: correctly stash wd modified/index deletedEdward Thomson2015-02-181-2/+1
| | |
* | | repository: remove log message override for switching the active branchCarlos Martín Nieto2015-03-035-35/+72
| | | | | | | | | | | | | | | | | | 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-033-13/+6
| | | | | | | | | | | | We always use "update by push".
* | | branch: don't accept a reflog message overrideCarlos Martín Nieto2015-03-032-19/+16
| | | | | | | | | | | | | | | | | | | | | 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-032-9/+6
| | | | | | | | | | | | | | | 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-0316-148/+183
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 #2908 from ethomson/safe_createCarlos Martín Nieto2015-03-034-8/+14
|\ \ \ | | | | | | | | Allow checkout to handle newly cloned repositories, remove `GIT_CHECKOUT_SAFE_CREATE`
| * | | checkout: remove `GIT_CHECKOUT_SAFE_CREATE` as a strategyEdward Thomson2015-02-272-9/+8
| | | |
| * | | checkout: upgrade to `SAFE_CREATE` when no index fileEdward Thomson2015-02-271-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | 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`.
| * | | 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
| | |_|/ | |/| |
* | | | win32: add the patch level to the .dll fileversionEdward Thomson2015-03-021-2/+2
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | rebase: check alloc resultEdward Thomson2015-02-271-0/+1
|/ /
* | 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.
* | 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-198-19/+19
| | | | | | | | | | 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-181-8/+8
| |
* | git_writestream: from git_filter_streamEdward Thomson2015-02-182-30/+30
| |
* | checkout: maintain temporary buffer for filtersEdward Thomson2015-02-173-12/+27
| | | | | | | | | | Let the filters use the checkout data's temporary buffer, instead of having to allocate new buffers each time.
* | checkout: stream the blob into the filtersEdward Thomson2015-02-172-39/+84
| | | | | | | | Use the new streaming filter API during checkout.
* | filters: stream internallyEdward Thomson2015-02-171-73/+81
| | | | | | | | | | Migrate the `git_filter_list_apply_*` functions over to using the new filter streams.
* | filters: introduce streaming filtersEdward Thomson2015-02-171-7/+231
| | | | | | | | | | | | | | Add structures and preliminary functions to take a buffer, file or blob and write the contents in chunks through an arbitrary number of chained filters, finally writing into a user-provided function accept the contents.
* | Remove extra semicolon outside of a functionStefan Widgren2015-02-1520-22/+22
| | | | | | | | | | Without this change, compiling with gcc and pedantic generates warning: ISO C does not allow extra ‘;’ outside of a function.
* | Merge pull request #2831 from ethomson/merge_lockCarlos Martín Nieto2015-02-157-59/+172
|\ \ | | | | | | merge: lock index during the merge (not just checkout)
| * | indexwriter: an indexwriter for repo operationsEdward Thomson2015-02-146-92/+79
| | | | | | | | | | | | | | | Provide git_indexwriter_init_for_operation for the common locking pattern in merge, rebase, revert and cherry-pick.
| * | merge-like operations: lock index while workingEdward Thomson2015-02-143-11/+67
| | |
| * | merge: lock the index at the start of the mergeEdward Thomson2015-02-141-2/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Always lock the index when we begin the merge, before we write any of the metdata files. This prevents a race where another client may run a commit after we have written the MERGE_HEAD but before we have updated the index, which will produce a merge commit that is treesame to one parent. The merge will finish and update the index and the resultant commit would not be a merge at all.
| * | checkout: introduce GIT_CHECKOUT_DONT_WRITE_INDEXEdward Thomson2015-02-141-1/+4
| | |
| * | git_indexwriter: lock then write the indexEdward Thomson2015-02-142-29/+79
| |/ | | | | | | | | | | Introduce `git_indexwriter`, to allow us to lock the index while performing additional operations, then complete the write (or abort, unlocking the index).
* | Merge pull request #2895 from ethomson/alloc_overflowCarlos Martín Nieto2015-02-1554-296/+791
|\ \ | | | | | | allocations: test for overflow of requested size
| * | pack-objects: unlock the cache on integer overflowEdward Thomson2015-02-131-4/+5
| | |
| * | integer overflow: use compiler intrinsics if supportedEdward Thomson2015-02-132-0/+20
| | | | | | | | | | | | | | | gcc and clang support __builtin_add_overflow, use it whenever possible, falling back to our naive routines.
| * | filebuf: use an int for return checkEdward Thomson2015-02-131-2/+2
| | |
| * | Make our overflow check look more like gcc/clang'sEdward Thomson2015-02-1335-341/+342
| | | | | | | | | | | | | | | | | | | | | | | | | | | Make our overflow checking look more like gcc and clang's, so that we can substitute it out with the compiler instrinsics on platforms that support it. This means dropping the ability to pass `NULL` as an out parameter. As a result, the macros also get updated to reflect this as well.
| * | Update `khash.h` to pull request 42Edward Thomson2015-02-124-5/+11
| | | | | | | | | | | | | | | https://github.com/attractivechaos/klib/pull/42/files introduces `kreallocarray`. Hook that up as our `git__reallocarray`.
| * | khash: update to klib f28c067Edward Thomson2015-02-121-24/+33
| | |
View Lorry Controller Status