diff options
| author | Junio C Hamano <gitster@pobox.com> | 2021-08-04 23:28:54 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2021-08-04 23:28:54 +0300 |
| commit | 1a6fb019d6c09f5e7e2b76fab2a6ad50a8506461 (patch) | |
| tree | b2fe947618c9af0df5becfd1d58ff91f14b0c37b /t | |
| parent | 506d2a354a9b24c531634094292b11ed8b8c2514 (diff) | |
| parent | 8b09a900a1f1f00d4deb04f567994ae8f1804b5e (diff) | |
Merge branch 'en/ort-perf-batch-14'
Further optimization on "merge -sort" backend.
* en/ort-perf-batch-14:
merge-ort: restart merge with cached renames to reduce process entry cost
merge-ort: avoid recursing into directories when we don't need to
merge-ort: defer recursing into directories when merge base is matched
merge-ort: add a handle_deferred_entries() helper function
merge-ort: add data structures for allowable trivial directory resolves
merge-ort: add some more explanations in collect_merge_info_callback()
merge-ort: resolve paths early when we have sufficient information
Diffstat (limited to 't')
| -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 4af4fb0038..5b81a130e9 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 failure '12f: Trivial directory resolve, caching, all kinds of fun' ' +test_expect_merge_algorithm failure success '12f: Trivial directory resolve, caching, all kinds of fun' ' test_setup_12f && ( cd 12f && |