summaryrefslogtreecommitdiff
path: root/tests-clar/reset/soft.c
Commit message (Collapse)AuthorAgeFilesLines
* Rename tests-clar to testsBen Straub2013-11-141-157/+0
|
* No such thing as an orphan branchCarlos Martín Nieto2013-09-171-4/+4
| | | | | | | | | | | Unfortunately git-core uses the term "unborn branch" and "orphan branch" interchangeably. However, "orphan" is only really there for the checkout command, which has the `--orphan` option so it doesn't actually create the branch. Branches never have parents, so the distinction of a branch with no parents is odd to begin with. Crucially, the error messages deal with unborn branches, so let's use that.
* reset: Cannot soft reset with a conflicted indexnulltoken2013-01-041-0/+25
|
* Rename ref and reflog apis for consistencyBen Straub2012-11-271-6/+6
|
* Reset all static variables to NULL in clar's __cleanupSascha Cunz2012-11-231-0/+2
| | | | | | | | | | | | Without this change, any failed assertion in the second (or a later) test inside a test suite has a chance of double deleting memory, resulting in a heap corruption. See #1096 for details. This leaves alone the test cases where we "just" use cl_git_sandbox_init() and cl_git_sandbox_cleanup(). These methods already take good care to not double delete a repository. Fixes #1096
* repo: enhance git_repository_state() detectionnulltoken2012-10-271-0/+1
|
* tests: fix a memory leaknulltoken2012-10-271-0/+2
|
* GIT_EUNMERGEDEdward Thomson2012-10-241-1/+3
|
* reset changes for mergeEdward Thomson2012-10-241-0/+13
|
* reset: make git_reset() cope with an orphaned HEADnulltoken2012-10-221-0/+21
|
* tests: leverage git_repository_detach_head()nulltoken2012-10-201-12/+1
|
* Add git_reset()nulltoken2012-06-071-0/+102
Currently supports Soft and Mixed modes.