summaryrefslogtreecommitdiff
path: root/tests/index/reuc.c
Commit message (Collapse)AuthorAgeFilesLines
* object_type: use new enumeration namesethomson/index_fixesEdward Thomson2018-12-011-1/+1
| | | | Use the new object_type enumeration names within the codebase.
* index: use new enum and structure namesEdward Thomson2018-12-011-3/+3
| | | | Use the new-style index names throughout our own codebase.
* treewide: remove use of C++ style commentsPatrick Steinhardt2018-07-131-1/+1
| | | | | | | | | C++ style comment ("//") are not specified by the ISO C90 standard and thus do not conform to it. While libgit2 aims to conform to C90, we did not enforce it until now, which is why quite a lot of these non-conforming comments have snuck into our codebase. Do a tree-wide conversion of all C++ style comments to the supported C style comments to allow us enforcing strict C90 compliance in a later commit.
* index: commit the changes to the index properlyEdward Thomson2018-06-291-0/+4
| | | | | | | Now that the index has a "dirty" state, where it has changes that have not yet been committed or rolled back, our tests need to be adapted to actually commit or rollback the changes instead of assuming that the index can be operated on in its indeterminate state.
* index::reuc tests: test that checkout succeedsEdward Thomson2018-06-261-8/+8
| | | | | | | | | The index::reuc tests must test that the checkout itself succeeds, otherwise subsequent tests are not valid. In fact, the checkouts were failing because when checking out `SAFE`, they cannot update the files that are in conflict. Change the checkout level to `FORCE` to ensure that they get updated correctly.
* reset: remove reflog message overrideCarlos Martín Nieto2015-03-031-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 functionsCarlos Martín Nieto2015-03-031-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.
* Allow to propagate checkout callbacks to git HARD resetSven Strickroth2014-08-031-4/+4
| | | | Signed-off-by: Sven Strickroth <email@cs-ware.de>
* Introduce cl_assert_equal_oidEdward Thomson2014-07-011-27/+27
|
* git_checkout_opts -> git_checkout_optionsBen Straub2014-03-061-3/+3
|
* Add reflog parameters to git_resetBen Straub2014-02-031-4/+4
|
* Reset helpers: use revparse insteadBen Straub2014-02-031-3/+3
|
* Rename tests-clar to testsBen Straub2013-11-141-0/+372