Re: Two bugs with renaming

From: Björn Steinbrink <b.steinbrink@gmx.de>
Date: Mar 20, 2008, 01:24 UTC
Message-ID: <20080320012454.GA16843@atjola.homenet>
In-Reply-To: <slrnfu37vn.d2i.jgoerzen@katherina.lan.complete.org>

On 2008.03.19 18:21:27 -0500, John Goerzen wrote:

Show 5 quoted lines

> Hi folks,
> 
> I have a transcript of a Git session that illustrates two odd bugs
> with Git renaming.  Command output is truncated except where
> interesting.

I have another one. Well, not necessarily a bug, but at least something that looks like it could be improved. I found that while trying to reproduce bug #1 (which doesn't show up here, as I'm using 1.5.5-something).

It seems to boil down to the fact that even when git detected a rename during a merge, it still uses the original file name to check for conflicts, causing somewhat bogus conflicts.

Test script is attached, when I run that, git correctly applies the changes from foo/file in master to foo2/file in "other", but nevertheless it complains that "foo" conflicts, although the directory is effectively empty and should therefore not be of any interest to git.

Björn