admin/git
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
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>
This commit is contained in:
Elijah Newren
2025-03-06 15:30:27 +00:00
committed by Junio C Hamano
parent 98a1a00d53
commit 3adba40858
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
merge-ort.c
View File

@@ -3048,7 +3048,8 @@ static int process_renames(struct merge_options *opt,
} }
} }
assert(source_deleted || oldinfo->filemask & old_sidemask); assert(source_deleted || oldinfo->filemask & old_sidemask ||
!strcmp(pair->one->path, pair->two->path));
/* Need to check for special types of rename conflicts... */ /* Need to check for special types of rename conflicts... */
if (collision && !source_deleted) { if (collision && !source_deleted) {

2
t/t6423-merge-rename-directories.sh
View File

@@ -5391,7 +5391,7 @@ test_setup_12n () {
) )
} }
test_expect_failure '12n: Directory rename transitively makes rename back to self' ' test_expect_success '12n: Directory rename transitively makes rename back to self' '
test_setup_12n && test_setup_12n &&
( (
cd 12n && cd 12n &&