| commit | e5c5e343d00eefb436a8643c5308205ce4e69b13 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Wed, 27 Jul 2022 20:00:28 +0000 (27 13:00 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Wed, 27 Jul 2022 20:00:28 +0000 (27 13:00 -0700) | ||
| tree | 0546ea9c5cb3e08426b2af0031908714ef8ed41b | treesnapshot (tar.gz zip) |
| parent | 494d31e9d6c7e6e40f53e06ae6909f00c4b5fb01 | commitdiff |
| parent | 751e16542472c7040565f97c2149c2d501ed0b81 | commitdiff |
Merge branch 'en/merge-dual-dir-renames-fix' into maint
Fixes a long-standing corner case bug around directory renames in
the merge-ort strategy.
source: <pull.1268.v4.git.1656984823.gitgitgadget@gmail.com>
* en/merge-dual-dir-renames-fix:
merge-ort: fix issue with dual rename and add/add conflict
merge-ort: shuffle the computation and cleanup of potential collisions
merge-ort: make a separate function for freeing struct collisions
merge-ort: small cleanups of check_for_directory_rename
t6423: add tests of dual directory rename plus add/add conflict
Fixes a long-standing corner case bug around directory renames in
the merge-ort strategy.
source: <pull.1268.v4.git.1656984823.gitgitgadget@gmail.com>
* en/merge-dual-dir-renames-fix:
merge-ort: fix issue with dual rename and add/add conflict
merge-ort: shuffle the computation and cleanup of potential collisions
merge-ort: make a separate function for freeing struct collisions
merge-ort: small cleanups of check_for_directory_rename
t6423: add tests of dual directory rename plus add/add conflict
| merge-ort.c | diff1 | diff2 | blobhistory |