summaryrefslogtreecommitdiff
path: root/tests/checkout/index.c
Commit message (Collapse)AuthorAgeFilesLines
* conflict tests: use GIT_IDXENTRY_STAGE_SETEdward Thomson2015-05-281-3/+3
|
* Remove the callbacks struct from the remoteCarlos Martín Nieto2015-05-131-3/+1
| | | | | | | | | | | | | | Having the setting be different from calling its actions was not a great idea and made for the sake of the wrong convenience. Instead of that, accept either fetch options, push options or the callbacks when dealing with the remote. The fetch options are currently only the callbacks, but more options will be moved from setters and getters on the remote to the options. This does mean passing the same struct along the different functions but the typical use-case will only call git_remote_fetch() or git_remote_push() and so won't notice much difference.
* Test: Create repo in while current dir is readonly and checkout symlinkLinquize2015-04-041-0/+47
|
* checkout: remove `GIT_CHECKOUT_SAFE_CREATE` as a strategyEdward Thomson2015-02-271-19/+30
|
* checkout: remove files before writing new onesEdward Thomson2015-01-201-2/+2
| | | | | | | On case insensitive filesystems, we may have files in the working directory that case fold to a name we want to write. Remove those files (by default) so that we will not end up with a filename that has the unexpected case.
* checkout_index: Remove stage 0 when checking out conflictsEdward Thomson2014-11-061-10/+39
|
* Introduce failing test for conflict filtering in indexEdward Thomson2014-10-131-0/+69
|
* git_checkout_opts -> git_checkout_optionsBen Straub2014-03-061-23/+23
|
* diff: rename the file's 'oid' to 'id'Carlos Martín Nieto2014-01-251-2/+2
| | | | In the same vein as the previous commits in this series.
* Rename tests-clar to testsBen Straub2013-11-141-0/+620