diff options
| author | Junio C Hamano <gitster@pobox.com> | 2021-04-16 23:53:34 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2021-04-16 23:53:34 +0300 |
| commit | 7bec8e7fa6175f51e79c55e28e6b2a547a986926 (patch) | |
| tree | 771cfbec9a53d9cd46f6dabf1613d012cf619fd2 /t/t6423-merge-rename-directories.sh | |
| parent | e2e1a03f6b9c0869e64710c94fc43df82a06f0c8 (diff) | |
| parent | f3b964a07ef70eee6bacefd1ed5f94eb871be902 (diff) | |
Merge branch 'en/ort-readiness'
Plug the ort merge backend throughout the rest of the system, and
start testing it as a replacement for the recursive backend.
* en/ort-readiness:
Add testing with merge-ort merge strategy
t6423: mark remaining expected failure under merge-ort as such
Revert "merge-ort: ignore the directory rename split conflict for now"
merge-recursive: add a bunch of FIXME comments documenting known bugs
merge-ort: write $GIT_DIR/AUTO_MERGE whenever we hit a conflict
t: mark several submodule merging tests as fixed under merge-ort
merge-ort: implement CE_SKIP_WORKTREE handling with conflicted entries
t6428: new test for SKIP_WORKTREE handling and conflicts
merge-ort: support subtree shifting
merge-ort: let renormalization change modify/delete into clean delete
merge-ort: have ll_merge() use a special attr_index for renormalization
merge-ort: add a special minimal index just for renormalization
merge-ort: use STABLE_QSORT instead of QSORT where required
Diffstat (limited to 't/t6423-merge-rename-directories.sh')
| -rwxr-xr-x | t/t6423-merge-rename-directories.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t6423-merge-rename-directories.sh b/t/t6423-merge-rename-directories.sh index 379aac0103..7134769149 100755 --- a/t/t6423-merge-rename-directories.sh +++ b/t/t6423-merge-rename-directories.sh @@ -4797,7 +4797,7 @@ test_setup_12f () { ) } -test_expect_merge_algorithm failure success '12f: Trivial directory resolve, caching, all kinds of fun' ' +test_expect_merge_algorithm failure failure '12f: Trivial directory resolve, caching, all kinds of fun' ' test_setup_12f && ( cd 12f && |