summaryrefslogtreecommitdiff
path: root/tests/cherrypick/workdir.c
Commit message (Collapse)AuthorAgeFilesLines
* Renamed git_merge_options 'flags' to 'tree_flags'Jacques Germishuys2015-03-161-2/+2
|
* reset: remove reflog message overrideCarlos Martín Nieto2015-03-031-10/+10
| | | | | 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-10/+10
| | | | | | | | | | 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.
* Fix test buildCarlos Martín Nieto2014-10-101-1/+1
| | | | | Some PRs have fallen out of sync with the changes in signatures, so we need to take a few extra parameters into account.
* Merge pull request #2499 from csware/hard-reset-checkout-callbacksCarlos Martín Nieto2014-10-101-9/+9
|\ | | | | Allow to propagate checkout callbacks to git HARD reset
| * Allow to propagate checkout callbacks to git HARD resetSven Strickroth2014-08-031-9/+9
| | | | | | | | Signed-off-by: Sven Strickroth <email@cs-ware.de>
* | Added test case to illustrate bogus conflicts detected if no files were ↵Jacques Germishuys2014-09-121-0/+41
|/ | | | merged, and untracked files exist in the workdir.
* git_cherry_pick -> git_cherrypickEdward Thomson2014-07-221-26/+26
|
* Added cherry pick testsJacques Germishuys2014-04-141-0/+429
View Lorry Controller Status