From: Jakub Narebski <jnareb@gmail.com>
To: Ittay Dror <ittayd@tikalk.com>
Cc: Jeff King <peff@peff.net>, git@vger.kernel.org
Subject: Re: detecting rename->commit->modify->commit
Date: Thu, 01 May 2008 08:47:33 -0700 (PDT) [thread overview]
Message-ID: <m3hcdi6n7r.fsf@localhost.localdomain> (raw)
In-Reply-To: <4819E226.6000404@tikalk.com>
Ittay Dror <ittayd@tikalk.com> writes:
> Jeff King wrote:
> >
> > Of course it doesn't work here. You have two files, one containing
> > "hello\n" and one containing "hello\nworld\n". Their similarity is 50%,
> > which is not enough to consider it a rename. And I would argue that's
> > reasonable, since the files have only one line in common. The problem is
> > that you are using a toy example (which is why my example used
> > /usr/share/dict/words, which has enough content to definitively call it
> > a rename).
> >
> >
> Well, I would have expected git to notice that the file was renamed in
> one commit and keep tracking changes afterwards.
>
> Also, as I wrote in another post, this happened to me with real files
> of a real source tree, and with very small changes (and sometimes not
> at all) to these files.
The idea of rename detection is to help with merges. If the files are
different enough that content based (similarity based) rename
detection doesn't detect rename, they are usually too different to
merge automatically anyway.
--
Jakub Narebski
Poland
ShadeHawk on #git
next prev parent reply other threads:[~2008-05-01 15:48 UTC|newest]
Thread overview: 49+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-05-01 14:10 detecting rename->commit->modify->commit Ittay Dror
2008-05-01 14:45 ` Jeff King
2008-05-01 15:08 ` Ittay Dror
2008-05-01 15:20 ` Jeff King
2008-05-01 15:30 ` Ittay Dror
2008-05-01 15:38 ` Jeff King
2008-05-01 15:47 ` Jakub Narebski [this message]
2008-05-01 20:39 ` Teemu Likonen
2008-05-01 23:09 ` Jeff King
2008-05-02 2:06 ` Sitaram Chamarty
2008-05-02 2:38 ` Junio C Hamano
2008-05-02 16:59 ` Sitaram Chamarty
2008-05-01 15:24 ` Ittay Dror
2008-05-01 15:28 ` Jeff King
2008-05-01 14:54 ` Ittay Dror
2008-05-01 15:09 ` Jeff King
2008-05-01 15:20 ` Ittay Dror
2008-05-01 15:30 ` David Tweed
2008-05-01 15:27 ` Avery Pennarun
2008-05-01 15:34 ` Jeff King
2008-05-01 15:50 ` Avery Pennarun
2008-05-01 16:48 ` Jeff King
2008-05-01 19:45 ` Avery Pennarun
2008-05-01 22:42 ` Jeff King
2008-05-01 19:12 ` Steven Grimm
2008-05-01 23:14 ` Jeff King
2008-05-03 17:56 ` merge renamed files/directories? (was: Re: detecting rename->commit->modify->commit) Ittay Dror
2008-05-03 18:11 ` Avery Pennarun
2008-05-04 6:08 ` merge renamed files/directories? Ittay Dror
2008-05-04 9:34 ` Jakub Narebski
2008-05-05 16:40 ` Avery Pennarun
2008-05-05 21:49 ` Robin Rosenberg
2008-05-05 22:20 ` Linus Torvalds
2008-05-05 23:07 ` Steven Grimm
2008-05-06 0:29 ` Linus Torvalds
2008-05-06 0:40 ` Linus Torvalds
2008-05-06 15:47 ` Theodore Tso
2008-05-06 16:10 ` Linus Torvalds
2008-05-06 16:15 ` Linus Torvalds
2008-05-06 16:32 ` Ittay Dror
2008-05-06 16:39 ` Linus Torvalds
2008-05-06 1:38 ` Avery Pennarun
2008-05-06 1:46 ` Shawn O. Pearce
2008-05-06 1:58 ` Avery Pennarun
2008-05-06 2:12 ` Shawn O. Pearce
2008-05-06 2:19 ` Linus Torvalds
2008-05-08 18:17 ` detecting rename->commit->modify->commit Jeff King
2008-05-01 16:39 ` Sitaram Chamarty
2008-05-01 18:58 ` Ittay Dror
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=m3hcdi6n7r.fsf@localhost.localdomain \
--to=jnareb@gmail.com \
--cc=git@vger.kernel.org \
--cc=ittayd@tikalk.com \
--cc=peff@peff.net \
/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).