From: Junio C Hamano <junkio@cox.net>
To: Linus Torvalds <torvalds@osdl.org>
Cc: git@vger.kernel.org
Subject: Re: git-pull - strange (copy/rename) messages ?!
Date: Tue, 01 Nov 2005 09:43:51 -0800 [thread overview]
Message-ID: <7vbr149sbs.fsf@assigned-by-dhcp.cox.net> (raw)
In-Reply-To: Pine.LNX.4.64.0511010801370.27915@g5.osdl.org
Linus Torvalds <torvalds@osdl.org> writes:
> Btw, Junio, I thought "git pull" was only supposed to do rename
> detection, not copy detection.
Sorry, but what do you mean by "only rename detection but not
copy detection" in this case?
When you have "ce A B; ce A C; ce A D;... ; mv A Z", (ce is like
cp but "copy+edit") where B-Z are all new files and A disappears
from the result, trying to detect renames would end up detecting
copies without extra processing; B through Z are rename
destination candidates, and A is a rename source candidate
(there may be others), and it turns out that B-Z all look like
A.
Would it be easier to read if we say A was renamed to B, and A
was renamed to C, and A was renamed to D, ...? I think the
current output is easier to understand than that. B-Y gets
labelled as copy of A and Z gets labelled as rename.
next prev parent reply other threads:[~2005-11-01 17:43 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2005-11-01 15:40 git-pull - strange (copy/rename) messages ?! Duncan Mac Leod
2005-11-01 16:10 ` Linus Torvalds
2005-11-01 17:43 ` Junio C Hamano [this message]
2005-11-01 22:03 ` Daniel Barkalow
2005-11-01 23:06 ` Petr Baudis
2005-11-01 23:24 ` Junio C Hamano
2005-11-01 23:36 ` Petr Baudis
2005-11-02 0:35 ` Junio C Hamano
2005-11-01 23:39 ` Daniel Barkalow
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=7vbr149sbs.fsf@assigned-by-dhcp.cox.net \
--to=junkio@cox.net \
--cc=git@vger.kernel.org \
--cc=torvalds@osdl.org \
/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).