aboutsummaryrefslogtreecommitdiffstats
path: root/t/t6423-merge-rename-directories.sh (follow)
AgeCommit message (Expand)AuthorFilesLines
2025-08-07merge-ort: fix directory rename on top of source of other rename/deleteElijah Newren1-15/+342
2025-08-07merge-ort: fix incorrect file handlingElijah Newren1-3/+66
2025-08-07t6423: fix missed staging of file in testcases 12i,12j,12kElijah Newren1-3/+6
2025-08-07t6423: document two bugs with rename-to-self testcasesElijah Newren1-2/+98
2025-04-08tests: remove GIT_TEST_MERGE_ALGORITHM and test_expect_merge_algorithmElijah Newren1-412/+105
2025-03-29Merge branch 'en/random-cleanups'Junio C Hamano1-3/+3
2025-03-17t6423: fix a comment that accidentally reversed two commitsElijah Newren1-3/+3
2025-03-06merge-ort: fix slightly overzealous assertion for rename-to-selfElijah Newren1-1/+1
2025-03-06t6423: add a testcase causing a failed assertion in process_renamesDmitry Goncharov1-0/+41
2025-02-03t6423: fix suppression of Git’s exit code in testsAyush Chandekar1-3/+6
2024-11-21t: remove TEST_PASSES_SANITIZE_LEAK annotationsPatrick Steinhardt1-1/+0
2024-09-05merge-ort: fix two leaks when handling directory rename modificationsPatrick Steinhardt1-0/+1
2023-11-02tests: teach callers of test_i18ngrep to use test_grepJunio C Hamano1-70/+70
2022-10-22merge-ort: fix bug with dir rename vs change dir to symlinkElijah Newren1-0/+56
2022-08-26t64xx: convert 'test_create_repo' to 'git init'Elijah Newren1-69/+69
2022-07-06merge-ort: fix issue with dual rename and add/add conflictElijah Newren1-2/+2
2022-07-06t6423: add tests of dual directory rename plus add/add conflictElijah Newren1-0/+105
2022-03-13t6423-merge-rename-directories.sh: use the $(...) constructElia Pinto1-5/+5
2021-07-20merge-ort: restart merge with cached renames to reduce process entry costElijah Newren1-1/+1
2021-07-16Merge branch 'en/merge-dir-rename-corner-case-fix'Junio C Hamano1-0/+175
2021-07-16Merge branch 'en/ort-perf-batch-12'Junio C Hamano1-1/+1
2021-06-30merge-recursive: handle rename-to-self caseElijah Newren1-3/+3
2021-06-30merge-ort: ensure we consult df_conflict and path_conflictsElijah Newren1-3/+3
2021-06-30t6423: test directory renames causing rename-to-selfElijah Newren1-0/+175
2021-06-14Merge branch 'en/ort-perf-batch-11'Junio C Hamano1-0/+58
2021-06-09Fix various issues found in commentsElijah Newren1-1/+1
2021-05-04t6423: rename file within directory that other side renamedElijah Newren1-0/+58
2021-04-16Merge branch 'en/ort-readiness'Junio C Hamano1-1/+1
2021-04-08Merge branch 'en/ort-perf-batch-9'Junio C Hamano1-0/+71
2021-03-20t6423: mark remaining expected failure under merge-ort as suchElijah Newren1-1/+1
2021-03-10merge-ort: precompute subset of sources for which we need rename detectionElijah Newren1-0/+71
2021-02-10tests: remove most uses of C_LOCALE_OUTPUTÆvar Arnfjörð Bjarmason1-1/+1
2020-10-26t6423: add more details about direct resolution of directoriesElijah Newren1-16/+23
2020-10-26t6423: note improved ort handling with untracked filesElijah Newren1-71/+124
2020-10-26t6423, t6436: note improved ort handling with dirty filesElijah Newren1-114/+152
2020-10-26t6423: expect improved conflict markers labels in the ort backendElijah Newren1-10/+28
2020-10-26t6404, t6423: expect improved rename/delete handling in ort backendElijah Newren1-20/+50
2020-10-26merge tests: expect improved directory/file conflict handling in ortElijah Newren1-15/+38
2020-10-26t/: new helper for tests that pass with ort but fail with recursiveElijah Newren1-6/+7
2020-10-16t6423: more involved rules for renaming directories into each otherElijah Newren1-26/+227
2020-10-16t6423: update directory rename detection tests with new ruleElijah Newren1-21/+123
2020-10-16t6423: more involved directory rename testElijah Newren1-0/+195
2020-08-10t642[23]: be more flexible for add/add conflicts involving pair renamesElijah Newren1-2/+2
2020-08-10t6423: add an explanation about why one of the tests does not passElijah Newren1-0/+8
2020-08-10t6416, t6423: clarify some comments and fix some typosElijah Newren1-13/+12
2020-08-10t6423: fix test setup for a couple testsElijah Newren1-0/+2
2020-08-10Collect merge-related tests to t64xxElijah Newren1-0/+4693
generated by cgit v1.2.3 (git 2.39.1) at 2026-01-03 23:25:06 +0000