summaryrefslogtreecommitdiff
path: root/tests/merge
Commit message (Collapse)AuthorAgeFilesLines
* merge::workdir::dirty: tick idx to defeat racy-gitEdward Thomson2015-06-161-0/+12
|
* introduce `git_index_entry_is_conflict`Edward Thomson2015-05-282-2/+2
| | | | | | | | | It's not always obvious the mapping between stage level and conflict-ness. More importantly, this can lead otherwise sane people to write constructs like `if (!git_index_entry_stage(entry))`, which (while technically correct) is unreadable. Provide a nice method to help avoid such messy thinking.
* merge: merge iteratorsEdward Thomson2015-05-111-1/+13
|
* Collapse whitespace flags into git_merge_file_flags_tJacques Germishuys2015-03-162-4/+4
|
* Renamed git_merge_options 'flags' to 'tree_flags'Jacques Germishuys2015-03-162-4/+4
|
* Added tests to merge files and branches with whitespace problems and fixesJacques Germishuys2015-03-162-0/+158
|
* reset: remove reflog message overrideCarlos Martín Nieto2015-03-033-8/+8
| | | | | 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-035-11/+11
| | | | | | | | | | 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.
* merge: lock the index at the start of the mergeEdward Thomson2015-02-141-0/+49
| | | | | | | | | | Always lock the index when we begin the merge, before we write any of the metdata files. This prevents a race where another client may run a commit after we have written the MERGE_HEAD but before we have updated the index, which will produce a merge commit that is treesame to one parent. The merge will finish and update the index and the resultant commit would not be a merge at all.
* merge test: test an actual failure, not conflictEdward Thomson2015-02-131-6/+5
| | | | | | Correct the merge failed cleanup test. Merge data should not be cleaned up on conflicts, only on actual failure. And ORIG_HEAD should not be removed at all.
* Fix broken merge tests due to autocrlf was not falseLinquize2014-12-071-0/+8
|
* s/git_merge_head/git_annotated_commitEdward Thomson2014-10-267-280/+282
| | | | | Rename git_merge_head to git_annotated_commit, as it becomes used in more operations than just merge.
* Merge pull request #2499 from csware/hard-reset-checkout-callbacksCarlos Martín Nieto2014-10-103-8/+8
|\ | | | | Allow to propagate checkout callbacks to git HARD reset
| * Allow to propagate checkout callbacks to git HARD resetSven Strickroth2014-08-033-8/+8
| | | | | | | | Signed-off-by: Sven Strickroth <email@cs-ware.de>
* | hashsig: Export as a `sys` headervmg/hashsigVicent Marti2014-10-011-1/+1
| |
* | Fixed merge REUC test for big-endian 64-bitJakub Čajka2014-09-261-1/+1
| |
* | Factor 40 and 41 constants from source.Ciro Santilli2014-09-161-4/+4
|/
* Merge pull request #2455 from ethomson/equal_oidVicent Marti2014-07-021-1/+1
|\ | | | | Introduce `cl_assert_equal_oid`
| * Introduce cl_assert_equal_oidEdward Thomson2014-07-011-1/+1
| |
* | git_checkout_index: checkout other indexesEdward Thomson2014-07-011-1/+1
|/ | | | | | | | git_checkout_index can now check out other git_index's (that are not necessarily the repository index). This allows checkout_index to use the repository's index for stat cache information instead of the index data being checked out. git_merge and friends now check out their indexes directly instead of trying to blend it into the running index.
* 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
| | | | | | git_merge_analysis will now return GIT_MERGE_CONFIG_NO_FASTFORWARD when merge.ff=false and GIT_MERGE_CONFIG_FASTFORWARD_ONLY when merge.ff=true
* 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
|
* Introduce GIT_MERGE_ANALYSIS_UNBORNEdward Thomson2014-03-201-4/+20
|
* git_merge_status -> git_merge_analysisEdward Thomson2014-03-201-22/+23
|
* Remove `git_merge_result` as it's now unnecessaryEdward Thomson2014-03-208-122/+34
|
* Update git_merge_tree_opts to git_merge_optionsEdward Thomson2014-03-2010-25/+25
|
* Change signature of `git_merge` to take merge and checkout optsEdward Thomson2014-03-208-45/+45
|
* Remove fastforward / uptodate from `git_merge`Edward Thomson2014-03-201-77/+47
|
* Add `git_merge_status` to provide info about an upcoming mergeEdward Thomson2014-03-202-148/+89
|
* Introduce git_merge_file for consumersEdward Thomson2014-03-205-74/+218
|
* git_checkout_opts -> git_checkout_optionsBen Straub2014-03-062-2/+2
|
* Prevent user's merge.conflictstyle from breaking testsBen Straub2014-02-052-0/+14
|
* Fix a few references to changed function signaturesBen Straub2014-02-051-3/+3
|
* Merge remote-tracking branch 'libgit2/development' into bs/more-reflog-stuffBen Straub2014-02-051-0/+322
|\
| * Test that emulates a strange filter implementationEdward Thomson2014-02-031-0/+70
| |
| * Tests merging staged files identical to resultEdward Thomson2014-02-031-0/+70
| |
| * Tests merge when changes exist in workdir/indexEdward Thomson2014-02-031-0/+182
| |
* | Add reflog parameters to git_resetBen Straub2014-02-032-4/+4
|/
* merge: rename _oid() -> id()Carlos Martín Nieto2014-01-253-49/+49
| | | | Following the rest of the series, use 'id' when refering to the value.
* index: rename an entry's id to 'id'Carlos Martín Nieto2014-01-256-9/+9
| | | | This was not converted when we converted the rest, so do it now.
* Merge submodulesEdward Thomson2014-01-201-0/+101
|
* Support union mergesEdward Thomson2014-01-201-0/+43
|
* Remove the "merge none" flagEdward Thomson2014-01-202-195/+28
| | | | | | | The "merge none" (don't automerge) flag was only to aide in merge trivial tests. We can easily determine whether merge trivial resulted in a trivial merge or an automerge by examining the REUC after automerge has completed.
* Load merge.conflictstyle setting from configEdward Thomson2014-01-201-0/+86
|
View Lorry Controller Status