From: Jeff King <peff@peff.net>
To: Michael Witten <mfwitten@gmail.com>
Cc: "Marcin Wiśnicki" <mwisnicki@gmail.com>, git@vger.kernel.org
Subject: Re: Merge after directory rename ?
Date: Tue, 23 Aug 2011 15:13:50 -0400 [thread overview]
Message-ID: <20110823191350.GA4016@sigill.intra.peff.net> (raw)
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
prev parent reply other threads:[~2011-08-23 19:13 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-08-21 21:41 Merge after directory rename ? Marcin Wiśnicki
2011-08-21 23:45 ` Michael Witten
2011-08-21 23:53 ` Michael Witten
2011-08-22 0:32 ` Marcin Wiśnicki
2011-08-22 2:19 ` Michael Witten
2011-08-22 8:49 ` Marcin Wiśnicki
2011-08-23 14:50 ` Michael Witten
2011-08-23 19:13 ` Jeff King [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20110823191350.GA4016@sigill.intra.peff.net \
--to=peff@peff.net \
--cc=git@vger.kernel.org \
--cc=mfwitten@gmail.com \
--cc=mwisnicki@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).