On 6/12/21 11:57 PM, Elijah Newren wrote:
There's two bugs here, and they actually predate v2.25. If you put all your files in a subdirectory (e.g. 'subdir/bar' instead of 'bar' and 'subdir/dir/bar' instead of 'dir/bar'), then the same bug reproduces going back many more versions. The changes in v2.25 to support directory rename detection of a subdirectory to the root just allowed this bug to happen at the toplevel as well.
You’re right. I’m sure you’ve already done this bisect, but for posterity, after that modification to the test case (‘mkdir subdir; cd subdir’ after ‘git init’), it reproduces back as far as 9c0743fe1e45b3a0ffe166ac949a27f95a3e5c34 (v2.18.0-rc0~2^2~20) “merge-recursive: apply necessary modifications for directory renames”.
Thanks for the quick investigation! Anders
