Re: [Gnu-arch-users] Maintainership, and whiners...

[Martin Langhoff]

On 10/14/05, Adrian Irving-Beer <address@hidden> wrote:
> >  + one of those merges deals with renames: if a target file in the
> >    patch isn't there, it walks up the commit history trying to find
> >    the commit where we last saw a file with that name, and then
> >    analyses that particular commit to detect the rename
>
> Boo, hiss.  "Fatal flaw" all over again.
>
> Now I can never use that same file name, not unless I want to invite
> applying merges to the same file.  Also, I have to have, at some
> point, used that file by its proper name in a commit.

No -- GIT doesn't only look for a filename match, that'd be naive.
Once it finds teh file, it tries to figure out if it's the same one
(SHA1 matches or a high similarity index). Same for identifying the
rename: it looks for new files in that commit with a high similarity
index.

cheers,



martin