summaryrefslogtreecommitdiff
path: root/tests/merge/merge_helpers.c
Commit message (Collapse)AuthorAgeFilesLines
* fileops: rename to "futils.h" to match function signaturesPatrick Steinhardt2019-07-201-1/+1
| | | | | | | | | Our file utils functions all have a "futils" prefix, e.g. `git_futils_touch`. One would thus naturally guess that their definitions and implementation would live in files "futils.h" and "futils.c", respectively, but in fact they live in "fileops.h". Rename the files to match expectations.
* blob: add underscore to `from` functionsEdward Thomson2019-06-161-1/+1
| | | | | | The majority of functions are named `from_something` (with an underscore) instead of `fromsomething`. Update the blob functions for consistency with the rest of the library.
* Convert usage of `git_buf_free` to new `git_buf_dispose`Patrick Steinhardt2018-06-101-3/+3
|
* merge: add simple recursive testEdward Thomson2015-11-251-1/+2
| | | | | Add a simple recursive test - where multiple ancestors exist and creating a virtual merge base from them would prevent a conflict.
* merge: add GIT_MERGE_TREE_FAIL_ON_CONFLICTEdward Thomson2015-10-221-4/+5
| | | | | | Provide a new merge option, GIT_MERGE_TREE_FAIL_ON_CONFLICT, which will stop on the first conflict and fail the merge operation with GIT_EMERGECONFLICT.
* Fix #3094 - improve use of portable size_t/ssize_t format specifiers.Matthew Plough2015-07-121-1/+1
| | | | The header src/cc-compat.h defines portable format specifiers PRIuZ, PRIdZ, and PRIxZ. The original report highlighted the need to use these specifiers in examples/network/fetch.c. For this commit, I checked all C source and header files not in deps/ and transitioned to the appropriate format specifier where appropriate.
* Remove the signature from ref-modifying functionsCarlos Martín Nieto2015-03-031-1/+1
| | | | | | | | | | 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.
* s/git_merge_head/git_annotated_commitEdward Thomson2014-10-261-4/+5
| | | | | Rename git_merge_head to git_annotated_commit, as it becomes used in more operations than just merge.
* Fixed merge REUC test for big-endian 64-bitJakub Čajka2014-09-261-1/+1
|
* Remove `git_merge_result` as it's now unnecessaryEdward Thomson2014-03-201-2/+2
|
* Update git_merge_tree_opts to git_merge_optionsEdward Thomson2014-03-201-3/+3
|
* Change signature of `git_merge` to take merge and checkout optsEdward Thomson2014-03-201-2/+4
|
* git_checkout_opts -> git_checkout_optionsBen Straub2014-03-061-1/+1
|
* index: rename an entry's id to 'id'Carlos Martín Nieto2014-01-251-2/+2
| | | | This was not converted when we converted the rest, so do it now.
* refs: remove the _with_log differentiationCarlos Martín Nieto2014-01-151-1/+1
| | | | | | Any well-behaved program should write a descriptive message to the reflog whenever it updates a reference. Let's make this more prominent by removing the version without the reflog parameters.
* Clean up warningsEdward Thomson2013-12-091-1/+0
|
* Bare naked merge and rebaseEdward Thomson2013-12-031-0/+28
|
* Rename tests-clar to testsBen Straub2013-11-141-0/+333
View Lorry Controller Status