summaryrefslogtreecommitdiff
path: root/tests-clar/reset
Commit message (Collapse)AuthorAgeFilesLines
* Rename tests-clar to testsBen Straub2013-11-146-602/+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.
* introduce git_conflict_iteratorEdward Thomson2013-05-171-1/+1
|
* Fix trailing whitespacesnulltoken2013-05-151-15/+15
|
* remove unmerged files during reset hardEdward Thomson2013-03-291-2/+66
|
* reset: Introduce git_reset_default()nulltoken2013-02-051-0/+180
|
* merge cleanup should actually cleanup and the test should actually testEdward Thomson2013-01-061-3/+3
|
* Rework checkout internals (again)Russell Belfer2013-01-041-3/+1
| | | | | | | | | | | | | | | | I've tried to map out the detailed behaviors of checkout and make sure that we're handling the various cases correctly, along with providing options to allow us to emulate "git checkout" and "git checkout-index" with the various flags. I've thrown away flags in the checkout API that seemed like clutter and added some new ones. Also, I've converted the conflict callback to a general notification callback so we can emulate "git checkout" output and display "dirty" files. As of this commit, the new behavior is not working 100% but some of that is probably baked into tests that are not testing the right thing. This is a decent snapshot point, I think, along the way to getting the update done.
* 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-233-0/+6
| | | | | | | | | | | | 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
* Fix reset hard tests on platforms with CRLFRussell Belfer2012-11-141-1/+16
| | | | | | The reset hard tests had hardcoded expected file content and was not correctly compensating for CRLF filtering when a file needed to be reverted by the reset hard. This fixes that.
* Update reset hard testRussell Belfer2012-11-091-20/+46
| | | | | | The `git_reset` API with the HARD option is still slightly broken, but this test now does exercise the ability of the command to revert modified files.
* 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-242-0/+48
|
* reset: make git_reset() cope with an orphaned HEADnulltoken2012-10-221-0/+21
|
* tests: leverage git_repository_detach_head()nulltoken2012-10-201-12/+1
|
* reset: prevent hard reset in a bare repositorynulltoken2012-10-151-0/+14
|
* reset: add support for GIT_RESET_HARD modenulltoken2012-09-171-0/+46
|
* errors: deploy GIT_EBAREREPO usagenulltoken2012-09-061-1/+1
|
* Add git_reset()nulltoken2012-06-074-0/+165
Currently supports Soft and Mixed modes.
View Lorry Controller Status