| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | tests: use legitimate object ids | Edward Thomson | 2016-02-28 | 1 | -4/+4 |
| | | | | | | Use legitimate (existing) object IDs in tests so that we have the ability to turn on strict object validation when running tests. | ||||
| * | Added git_diff_index_to_index() | Pierre-Olivier Latour | 2015-06-30 | 1 | -0/+32 |
| | | |||||
| * | Fixed GIT_DELTA_CONFLICTED not returned in some cases | Pierre-Olivier Latour | 2015-06-23 | 1 | -1/+30 |
| | | | | | | | | | If an index entry for a file that is not in HEAD is in conflicted state, when diffing HEAD with the index, the status field of the corresponding git_diff_delta was incorrectly reported as GIT_DELTA_ADDED instead of GIT_DELTA_CONFLICTED. This was due to handle_unmatched_new_item() initially setting the status to GIT_DELTA_CONFLICTED but then overriding it later with GIT_DELTA_ADDED. | ||||
| * | diff: introduce binary diff callbacks | Edward Thomson | 2015-06-12 | 1 | -5/+5 |
| | | | | | | | | Introduce a new binary diff callback to provide the actual binary delta contents to callers. Create this data from the diff contents (instead of directly from the ODB) to support binary diffs including the workdir, not just things coming out of the ODB. | ||||
| * | Fixed build warnings on Xcode 6.1 | Pierre-Olivier Latour | 2015-06-02 | 1 | -1/+1 |
| | | |||||
| * | diff conflicts: add tests for tree to index | Edward Thomson | 2015-05-28 | 1 | -0/+76 |
| | | |||||
| * | Remove converting user error to GIT_EUSER | Russell Belfer | 2013-12-11 | 1 | -3/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This changes the behavior of callbacks so that the callback error code is not converted into GIT_EUSER and instead we propagate the return value through to the caller. Instead of using the giterr_capture and giterr_restore functions, we now rely on all functions to pass back the return value from a callback. To avoid having a return value with no error message, the user can call the public giterr_set_str or some such function to set an error message. There is a new helper 'giterr_set_callback' that functions can invoke after making a callback which ensures that some error message was set in case the callback did not set one. In places where the sign of the callback return value is meaningful (e.g. positive to skip, negative to abort), only the negative values are returned back to the caller, obviously, since the other values allow for continuing the loop. The hardest parts of this were in the checkout code where positive return values were overloaded as meaningful values for checkout. I fixed this by adding an output parameter to many of the internal checkout functions and removing the overload. This added some code, but it is probably a better implementation. There is some funkiness in the network code where user provided callbacks could be returning a positive or a negative value and we want to rely on that to cancel the loop. There are still a couple places where an user error might get turned into GIT_EUSER there, I think, though none exercised by the tests. | ||||
| * | Rename tests-clar to tests | Ben Straub | 2013-11-14 | 1 | -0/+167 |
 |
index : delta/libgit2.git | |
| github.com: libgit2/libgit2.git |
| summaryrefslogtreecommitdiff |