summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
| * | Fix spelling mistakeJohn Crepezzi2014-01-041-1/+1
|/ / | | | | Closes #2029
* | Merge pull request #2022 from KTXSoftware/developmentRussell Belfer2014-01-034-1/+30
|\ \ | | | | | | submodule branch option + little VS2013 fix
| * | Read the submodule branch option from Git 1.8.2.Robert Konrad2014-01-023-0/+29
| | |
| * | Fixed a compile error in VS2013.Robert Konrad2014-01-021-1/+1
| |/
* | Merge pull request #2026 from libgit2/rb/fix-strnlen-on-old-macosVicent Marti2014-01-031-2/+6
|\ \ | | | | | | Use our strnlen on MacOS for backward compat
| * | Use our strnlen on MacOS for backward compatRussell Belfer2014-01-031-2/+6
|/ / | | | | | | | | | | Apparently MacOS didn't have strnlen on 10.6 and earlier. To avoid having linking problems on older versions, we'll just use our internal version.
* | Fix warnings with submodule changesRussell Belfer2014-01-022-4/+4
|/
* Merge pull request #2019 from linquize/recurse-on-demandVicent Marti2014-01-024-22/+72
|\ | | | | Accept 'submodule.*.fetchRecurseSubmodules' config 'on-demand' value
| * Update test related to fetchRecurseSubmodulesLinquize2013-12-311-8/+17
| |
| * Default value for fetchRecurseSubmodules should be yesLinquize2013-12-311-0/+1
| |
| * Accept 'submodule.*.fetchRecurseSubmodules' config 'on-demand' valueLinquize2013-12-313-14/+54
| |
* | Merge pull request #2020 from mrshu/patch-1Vicent Marti2014-01-021-3/+3
|\ \ | |/ |/| Updated fetch.c test to pass.
| * Updated fetch.c test to pass.Marek Šuppa2013-12-311-3/+3
|/ | | I am not sure why there was 6 in the first place.
* Merge pull request #2015 from txdv/patch-1Russell Belfer2013-12-301-1/+0
|\ | | | | docs: Remove non existing wrapper from the readme
| * docs: Remove non existing wrapper from the readmeAndrius Bentkus2013-12-271-1/+0
|/ | | libgit2net stopped to exist, all hail libgit2sharp
* Merge pull request #1920 from libgit2/cmn/ref-with-logVicent Marti2013-12-1813-177/+697
|\ | | | | Reference operations with log
| * refs: expose has_log() on the backendCarlos Martín Nieto2013-12-097-22/+36
| | | | | | | | | | | | The frontend used to look at the file directly, but that's obviously not the right thing to do. Expose it on the backend and use that function instead.
| * refs: expose a way to ensure a ref has a logCarlos Martín Nieto2013-12-098-5/+65
| | | | | | | | | | | | Sometimes (e.g. stash) we want to make sure that a log will be written, even if it's not in one of the standard locations. Let's make that easier.
| * reflog: write to the reflog following git's rulesCarlos Martín Nieto2013-12-093-3/+70
| | | | | | | | | | | | git-core only writes to the reflogs of HEAD, refs/heads/ and, refs/notes/ or if there is already a reflog in place. Adjust our code to follow these semantics.
| * reflog: remove git_reflog_append_to()Carlos Martín Nieto2013-11-233-60/+1
| | | | | | | | | | | | This was a convenience method for the refs front-end to do the reflog writing. This is now done in the backend and it has no more reason for being.
| * reflog: integrate into the ref writingCarlos Martín Nieto2013-11-239-176/+171
| | | | | | | | | | | | | | | | | | | | | | | | Whenever a reference is created or updated, we need to write to the reflog regardless of whether the user gave us a message, so we shouldn't leave that to the ref frontend, but integrate it into the backend. This also eliminates the race between ref update and writing to the reflog, as we protect the reflog with the ref lock. As an additional benefit, this reflog append on the backend happens by appending to the file instead of parsing and rewriting it.
| * refdb: add a `message` parameter for appending to the logCarlos Martín Nieto2013-11-235-24/+46
| | | | | | | | This is as yet unused.
| * refs: adjust to the new reflog APICarlos Martín Nieto2013-11-233-19/+7
| |
| * refs: Introduce git_reference_symbolic_set_target_with_log()nulltoken2013-11-233-5/+96
| |
| * refs: Introduce git_reference_set_target_with_log()nulltoken2013-11-233-4/+110
| |
| * refs: Introduce git_reference_symbolic_create_with_log()nulltoken2013-11-233-0/+88
| |
| * refs: Introduce git_reference_create_with_log()nulltoken2013-11-233-3/+150
| |
| * refs: Centralize reference creation logicnulltoken2013-11-231-25/+26
| |
* | Merge pull request #2000 from ethomson/overwrite_ignoredVicent Marti2013-12-133-8/+132
|\ \ | | | | | | Overwrite ignored files on checkout
| * | Overwrite ignored directories on checkoutEdward Thomson2013-12-132-9/+45
| | |
| * | Overwrite ignored files on checkoutEdward Thomson2013-12-133-6/+94
|/ /
* | Merge pull request #1986 from libgit2/rb/error-handling-cleanupsVicent Marti2013-12-13109-1637/+2325
|\ \ | | | | | | Clean up some error handling and change callback error behavior
| * | pool: Agh, this test doesn't really apply in 32-bit machinesVicent Marti2013-12-131-3/+0
| | | | | | | | | | | | | | | | | | The size_t is 32-bit already, so it overflows before going into the function. The `-1` test should handle this gracefully in both cases anyway.
| * | pool: Correct overflow checksVicent Marti2013-12-132-1/+8
| | | | | | | | | | | | | | | | | | | | | Ok, scrap the previous commit. This is the right overflow check that takes care of 64 bit overflow **and** 32-bit overflow, which needs to be considered because the pool malloc can only allocate 32-bit elements in one go.
| * | pool: Cleanup error handling in pool_strdupVicent Marti2013-12-131-15/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Note that `git_pool_strdup` cannot really return any error codes, because the pool doesn't set errors on OOM. The only place where `giterr_set_oom` is called is in `git_pool_strndup`, in a conditional check that is always optimized away. `n + 1` cannot be zero if `n` is unsigned because the compiler doesn't take wraparound into account. This check has been removed altogether because `size_t` is not particularly going to overflow.
| * | Add git_treebuilder_insert test and clarify docRussell Belfer2013-12-122-17/+78
| | | | | | | | | | | | | | | | | | This wasn't being tested and since it has a callback, I fixed it even though the return value of this callback is not treated like any of the other callbacks in the API.
| * | Cleanups, renames, and leak fixesRussell Belfer2013-12-1217-21/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | This renames git_vector_free_all to the better git_vector_free_deep and also contains a couple of memory leak fixes based on valgrind checks. The fixes are specifically: failure to free global dir path variables when not compiled with threading on and failure to free filters from the filter registry that had not be initialized fully.
| * | More tests of canceling from callbacksRussell Belfer2013-12-123-43/+186
| | | | | | | | | | | | | | | This covers diff print, push, and ref foreach. This also has a fix for a small memory leak in the push tests.
| * | Fix up some valgrind leaks and warningsRussell Belfer2013-12-114-18/+28
| | |
| * | Test cancel from indexer progress callbackRussell Belfer2013-12-1110-88/+95
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This adds tests that try canceling an indexer operation from within the progress callback. After writing the tests, I wanted to run this under valgrind and had a number of errors in that situation because mmap wasn't working. I added a CMake option to force emulation of mmap and consolidated the Amiga-specific code into that new place (so we don't actually need separate Amiga code now, just have to turn on -DNO_MMAP). Additionally, I made the indexer code propagate error codes more reliably than it used to.
| * | More improvements to callback return value testsRussell Belfer2013-12-112-32/+132
| | | | | | | | | | | | | | | | | | This time actually checking return values in diff notify tests and actually testing callbacks for the index all-all/update-all/etc functions.
| * | Try a test that won't assert on LinuxRussell Belfer2013-12-111-2/+2
| | |
| * | Update clone doc and tests for callback return valRussell Belfer2013-12-113-26/+91
| | | | | | | | | | | | | | | | | | | | | Clone callbacks can return non-zero values to cancel the clone. This adds some tests to verify that this actually works and updates the documentation to be clearer that this can happen and that the return value will be propagated back by the clone function.
| * | Fix checkout notify callback docs and testsRussell Belfer2013-12-113-10/+93
| | | | | | | | | | | | | | | | | | | | | The checkout notify callback behavior on non-zero return values was not being tested. This adds tests, fixes a bug with positive values, and clarifies the documentation to make it clear that the checkout can be canceled via this mechanism.
| * | Update git_blob_create_fromchunks callback behavrRussell Belfer2013-12-113-38/+78
| | | | | | | | | | | | | | | | | | | | | The callback to supply data chunks could return a negative value to stop creation of the blob, but we were neither using GIT_EUSER nor propagating the return value. This makes things use the new behavior of returning the negative value back to the user.
| * | Update docs for new callback return value behaviorRussell Belfer2013-12-1113-58/+91
| | |
| * | One more rename/cleanup for callback err functionsRussell Belfer2013-12-1124-49/+71
| | |
| * | Further callback error check style fixesRussell Belfer2013-12-113-19/+36
| | | | | | | | | | | | | | | Okay, I've decided I like the readability of this style much better so I used it everywhere.
| * | Some callback error check style cleanupsRussell Belfer2013-12-1112-30/+54
| | | | | | | | | | | | I find this easier to read...
| * | Fix C99 __func__ for MSVCRussell Belfer2013-12-111-0/+4
| | |
View Lorry Controller Status