summaryrefslogtreecommitdiff
path: root/tests/merge/workdir
Commit message (Expand)AuthorAgeFilesLines
* path: separate git-specific path functions from utilEdward Thomson2021-11-092-90/+90
* str: introduce `git_str` for internal, `git_buf` is externalethomson/gitstrEdward Thomson2021-10-177-75/+71
* tests: don't generate false positives on empty path segmentsPeter Pettersson2021-08-081-2/+2
* fileops: rename to "futils.h" to match function signaturesPatrick Steinhardt2019-07-204-4/+4
* tests: merge::analysis: use variants to deduplicate test suitesPatrick Steinhardt2019-06-131-80/+0
* Review fixes:Robert Coup2019-06-101-13/+18
* Refactor testing:Robert Coup2019-06-101-112/+14
* merge: add doc header to analysis testsRobert Coup2019-06-101-0/+3
* object_type: use new enumeration namesethomson/index_fixesEdward Thomson2018-12-011-6/+6
* Merge pull request #4770 from tiennou/feature/merge-analysis-any-branchPatrick Steinhardt2018-11-301-20/+49
|\
| * merge: make analysis possible against a non-HEAD referenceEtienne Samson2018-10-191-20/+49
* | Merge branch 'issue-4203'Edward Thomson2018-10-201-0/+29
|\ \ | |/ |/|
| * tests: add test case for index reloads on mergeEtiene Dalcol2017-11-111-0/+29
* | Merge pull request #4702 from tiennou/fix/coverityPatrick Steinhardt2018-07-201-1/+1
|\ \
| * | tests: add missing cl_git_pass to testsEtienne Samson2018-07-061-1/+1
* | | treewide: remove use of C++ style commentsPatrick Steinhardt2018-07-136-6/+6
|/ /
* | Convert usage of `git_buf_free` to new `git_buf_dispose`Patrick Steinhardt2018-06-106-25/+25
* | merge: reverse merge bases for recursive mergeEdward Thomson2018-02-041-5/+5
* | merge: recursive uses larger conflict markersEdward Thomson2018-01-211-2/+2
* | Do not attempt to check out submodule as blob when merging a submodule modify...David Turner2017-12-041-0/+36
|/
* Fix rebase bug and include test for merge=unionStan Hu2016-03-171-0/+36
* merge::workdir::dirty: update to use `st_ctime_nsec`Edward Thomson2016-03-071-2/+2
* win32: introduce p_timeval that isn't stupidEdward Thomson2016-02-121-1/+1
* merge tests: correct castsEdward Thomson2016-02-111-3/+3
* merge: handle conflicts in recursive base buildingEdward Thomson2015-11-251-1/+34
* recursive: test conflict output during recursive mergeEdward Thomson2015-11-251-0/+51
* merge tests: move expected data into own fileEdward Thomson2015-11-251-0/+1
* merge: rename `git_merge_tree_flags_t` -> `git_merge_flags_t`Edward Thomson2015-11-251-3/+3
* cmake: Only provide USE_NSEC if struct stat members are avilable.Axel Rasmussen2015-09-181-2/+1
* cmake: add USE_NSEC, and only check nanosec m/ctime if enabledAxel Rasmussen2015-09-181-1/+7
* merge: work around write-side racy protection when hacking the indexCarlos Martín Nieto2015-06-221-1/+14
* merge::workdir::dirty: tick idx to defeat racy-gitEdward Thomson2015-06-161-0/+12
* introduce `git_index_entry_is_conflict`Edward Thomson2015-05-281-1/+1
* Renamed git_merge_options 'flags' to 'tree_flags'Jacques Germishuys2015-03-161-3/+3
* reset: remove reflog message overrideCarlos Martín Nieto2015-03-033-8/+8
* Remove the signature from ref-modifying functionsCarlos Martín Nieto2015-03-034-10/+10
* merge: lock the index at the start of the mergeEdward Thomson2015-02-141-0/+49
* merge test: test an actual failure, not conflictEdward Thomson2015-02-131-6/+5
* Fix broken merge tests due to autocrlf was not falseLinquize2014-12-071-0/+8
* s/git_merge_head/git_annotated_commitEdward Thomson2014-10-266-276/+277
* Allow to propagate checkout callbacks to git HARD resetSven Strickroth2014-08-033-8/+8
* git_checkout_index: checkout other indexesEdward Thomson2014-07-011-1/+1
* Modify GIT_MERGE_CONFIG -> GIT_MERGE_PREFERENCEEdward Thomson2014-05-271-18/+18
* Move GIT_MERGE_CONFIG_* to its own enumEdward Thomson2014-05-271-31/+38
* Introduce GIT_MERGE_CONFIG_* for merge.ff settingsEdward Thomson2014-05-271-0/+26
* merge: checkout default shouldn't clobber givenEdward Thomson2014-04-232-10/+11
* merge: default checkout strategy for should be SAFEEdward Thomson2014-04-231-0/+17
* Capture conflict information in MERGE_MSG for revert and mergeJacques Germishuys2014-04-141-1/+9
* Introduce git_merge_head_idEdward Thomson2014-03-311-0/+27
* UNBORN implies FAST_FORWARDEdward Thomson2014-03-201-1/+2
View Lorry Controller Status