From: Jeff King <peff@peff.net>
Date: Tue, 23 Aug 2011 19:13:50 GMT
Subject: Re: Merge after directory rename ?
Message-ID: <20110823191350.GA4016@sigill.intra.peff.net>
In-Reply-To: <CAMOZ1Bt8cP146xiDXfSA-naSOaS3AC8pUZgW12=3TMg2JGCD=w@mail.gmail.com>

On Sun, Aug 21, 2011 at 11:53:34PM +0000, Michael Witten wrote:

> This is because git fundamentally tracks content, and paths are just
> one kind of content associated with another blob of content.
> Consequently, git really knows next to nothing about directories, so
> it's not too surprising that git doesn't bother finding such a
> DIRECTORY rename anyway (at most, git would detect a FILE rename, and
> your FILE `dir1/file2' has nothing to do with, say, the FILE
> `dir1/file1' being renamed `dir2/file1').
> 
> Still, some command line switches could be useful to help the user
> express to git what should be going on in a case such as yours.

FYI, Yann Dirson was working on some patches to detect directory
renames, but we haven't heard anything for a while. The last version I
could find was:

  http://thread.gmane.org/gmane.comp.version-control.git/163328

-Peff