merge-ort: fix slightly overzealous assertion for rename-to-self

merge-ort has a number of sanity checks on the file it is processing in process_renames(). One of these sanity checks was slightly overzealous because it indirectly assumed that a renamed file always ended up at a different path than where it started. That is normally an entirely fair assumption, but directory rename detection can make things interesting. As a quick refresher, if one side of history renames directory A/ -> B/, and the other side of history adds new files to A/, then directory rename detection notices and suggests moving those new files to B/. A similar thing is done for paths renamed into A/, causing them to be transitively renamed into B/. But, if the file originally came from B/, then this can end up causing a file to be renamed back to itself. It turns out the rest of the code following this assertion handled the case fine; the assertion was just an extra sanity check, not a rigid precondition. Therefore, simply adjust the assertion to pass under this special case as well. Signed-off-by: Elijah Newren <newren@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>

Elijah Newren committed Mar 6, 2025 at 15:30 UTC 3adba40858036a5a44f550aaab5287ad135f5f87
2 files changed +3 -2
merge-ort.c
+2 -1
@@ -3048,7 +3048,8 @@ static int process_renames(struct merge_options *opt,
3048 }
3049 }
3050
3051 - assert(source_deleted || oldinfo->filemask & old_sidemask);
3051 + assert(source_deleted || oldinfo->filemask & old_sidemask ||
3052 + !strcmp(pair->one->path, pair->two->path));
3053
3054 /* Need to check for special types of rename conflicts... */
3055 if (collision && !source_deleted) {
t/t6423-merge-rename-directories.sh
+1 -1
@@ -5391,7 +5391,7 @@ test_setup_12n () {
5391 )
5392 }
5393
5394 -test_expect_failure '12n: Directory rename transitively makes rename back to self' '
5394 +test_expect_success '12n: Directory rename transitively makes rename back to self' '
5395 test_setup_12n &&
5396 (
5397 cd 12n &&