diff options
author | Elijah Newren <newren@gmail.com> | 2021-01-23 22:01:11 -0800 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2021-01-23 23:30:06 -0800 |
commit | 5ced7c3da009090c5a926e3123a71314c7f28d42 (patch) | |
tree | cf37bd00e0b001c166f1002be9500504dff345b0 /Documentation/RelNotes/2.20.1.txt | |
parent | merge-ort: fix massive leak (diff) | |
download | tgif-5ced7c3da009090c5a926e3123a71314c7f28d42.tar.xz |
merge-ort: ignore the directory rename split conflict for now
get_provisional_directory_renames() has code to detect directories being
evenly split between different locations. However, as noted previously,
if there are no new files added to that directory that was split evenly,
our inability to determine where the directory was renamed to doesn't
matter since there are no new files to try to move into the new
location. Unfortunately, that code is unaware of whether there are new
files under the directory in question and we just ignore that, causing
us to fail t6423 test 2b but pass test 2a; turn off the error for now,
swapping which tests pass and fail.
The motivating reason for switching this off as a temporary measure is
that as we add optimizations, we'll start looking at only subsets of
renames, and subsets of renames can start switching the result we get
when this error is (wrongly) on. Once we get enough optimizations,
however, we can prevent that code from even running when there are no
new files added to the relevant directory, at which point we can revert
this commit and then both testcases 2a and 2b will pass simultaneously.
Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/RelNotes/2.20.1.txt')
0 files changed, 0 insertions, 0 deletions