| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | object_type: use new enumeration namesethomson/index_fixes | Edward Thomson | 2018-12-01 | 1 | -6/+6 |
| | | | | | Use the new object_type enumeration names within the codebase. | ||||
| * | tests: add missing cl_git_pass to tests | Etienne Samson | 2018-07-06 | 1 | -1/+1 |
| | | | | Reported by Coverity, CID 1393678-1393697. | ||||
| * | Convert usage of `git_buf_free` to new `git_buf_dispose` | Patrick Steinhardt | 2018-06-10 | 1 | -4/+4 |
| | | |||||
| * | merge::workdir::dirty: update to use `st_ctime_nsec` | Edward Thomson | 2016-03-07 | 1 | -2/+2 |
| | | | | | | Update unit test to use newfangled `st_ctime_nsec`, which provides indirection to the platform-correct name. | ||||
| * | win32: introduce p_timeval that isn't stupid | Edward Thomson | 2016-02-12 | 1 | -1/+1 |
| | | | | | | Windows defines `timeval` with `long`, which we cannot sanely cope with. Instead, use a custom timeval struct. | ||||
| * | merge tests: correct casts | Edward Thomson | 2016-02-11 | 1 | -3/+3 |
| | | |||||
| * | cmake: Only provide USE_NSEC if struct stat members are avilable. | Axel Rasmussen | 2015-09-18 | 1 | -2/+1 |
| | | | | | | | This allows us to remove OS checks from source code, instead relying on CMake to detect whether or not `struct stat` has the nanoseconds members we rely on. | ||||
| * | cmake: add USE_NSEC, and only check nanosec m/ctime if enabled | Axel Rasmussen | 2015-09-18 | 1 | -1/+7 |
| | | |||||
| * | merge: work around write-side racy protection when hacking the index | Carlos Martín Nieto | 2015-06-22 | 1 | -1/+14 |
| | | | | | | | | | | | As we attempt to replicate a situation in which an older checkout has put a file on disk with different filtering settings from us, set the timestamp on the entry and file to a second before we're performing the operation so the entry in the index counts as old. This way we can test that we're not looking at the on-disk file when the index has the entry and we detect it as clean. | ||||
| * | merge::workdir::dirty: tick idx to defeat racy-git | Edward Thomson | 2015-06-16 | 1 | -0/+12 |
| | | |||||
| * | reset: remove reflog message override | Carlos Martín Nieto | 2015-03-03 | 1 | -4/+4 |
| | | | | | | 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 functions | Carlos Martín Nieto | 2015-03-03 | 1 | -4/+4 |
| | | | | | | | | | | | 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. | ||||
| * | s/git_merge_head/git_annotated_commit | Edward Thomson | 2014-10-26 | 1 | -4/+4 |
| | | | | | | Rename git_merge_head to git_annotated_commit, as it becomes used in more operations than just merge. | ||||
| * | Allow to propagate checkout callbacks to git HARD reset | Sven Strickroth | 2014-08-03 | 1 | -4/+4 |
| | | | | | Signed-off-by: Sven Strickroth <email@cs-ware.de> | ||||
| * | git_checkout_index: checkout other indexes | Edward Thomson | 2014-07-01 | 1 | -1/+1 |
| | | | | | | | | | git_checkout_index can now check out other git_index's (that are not necessarily the repository index). This allows checkout_index to use the repository's index for stat cache information instead of the index data being checked out. git_merge and friends now check out their indexes directly instead of trying to blend it into the running index. | ||||
| * | merge: checkout default shouldn't clobber given | Edward Thomson | 2014-04-23 | 1 | -8/+7 |
| | | |||||
| * | merge: default checkout strategy for should be SAFE | Edward Thomson | 2014-04-23 | 1 | -0/+17 |
| | | |||||
| * | Remove `git_merge_result` as it's now unnecessary | Edward Thomson | 2014-03-20 | 1 | -24/+7 |
| | | |||||
| * | Update git_merge_tree_opts to git_merge_options | Edward Thomson | 2014-03-20 | 1 | -1/+1 |
| | | |||||
| * | Change signature of `git_merge` to take merge and checkout opts | Edward Thomson | 2014-03-20 | 1 | -4/+5 |
| | | |||||
| * | Fix a few references to changed function signatures | Ben Straub | 2014-02-05 | 1 | -3/+3 |
| | | |||||
| * | Test that emulates a strange filter implementation | Edward Thomson | 2014-02-03 | 1 | -0/+70 |
| | | |||||
| * | Tests merging staged files identical to result | Edward Thomson | 2014-02-03 | 1 | -0/+70 |
| | | |||||
| * | Tests merge when changes exist in workdir/index | Edward Thomson | 2014-02-03 | 1 | -0/+182 |
 |
index : delta/libgit2.git | |
| github.com: libgit2/libgit2.git |
| summaryrefslogtreecommitdiff |