Re: [ANNOUNCE] Git wiki
From: Junio C Hamano <hidden>
Date: 2016-06-15 22:42:25
Petr Baudis [off-list ref] writes:
But the non-obviously important part here to note is that the branch B merely "corrects a typo on a comment somewhere" - the latest versions in branch A and branch B are always compared for renames, therefore if branch A renamed the file and branch B sums up to some larger-scale changes in the file, it still won't be merged properly.
I probably am guilty of starting this misinformation, but the code does not compare the latest in A and B for rename detection; it compares (O, A) and (O, B). But the end result is the same - what you say is correct. If a path (say O to A) that renamed has too big a change, then no matter how small the changes are on the other path (O to B), rename detection can be fooled. We could perhaps alleviate it by following the whole commit chain.