From: Andy Parkins <andyparkins@gmail.com>
To: git@vger.kernel.org
Cc: Linus Torvalds <torvalds@linux-foundation.org>,
Jeff King <peff@peff.net>,
Johannes Schindelin <Johannes.Schindelin@gmx.de>,
"Shawn O. Pearce" <spearce@spearce.org>,
govindsalinas <govindsalinas@yahoo.com>,
gitster@pobox.com
Subject: Re: [PATCH] diffcore-rename: favour identical basenames
Date: Fri, 22 Jun 2007 16:19:26 +0100 [thread overview]
Message-ID: <200706221619.30521.andyparkins@gmail.com> (raw)
In-Reply-To: <alpine.LFD.0.98.0706210910390.3593@woody.linux-foundation.org>
On Thursday 2007 June 21, Linus Torvalds wrote:
> The files are *identical* for christ sake! Following their history, it
> doesn't matter *which* base you follow, since regardless, they've come to
> the same point!
>
> So in that sense, the current git behaviour is actually perfectly fine.
Perhaps not. (Please don't read this as meaning I disagree with your
favour-the-identical-filename patch at all - in fact I think that would
address the case I give below).
What if two files with different filenames and content converge at some point
in history, then diverge again? If git is tracking renames merely by content
and picks the wrong one, then the history of fileA suddenly becomes the
history of fileB.
Andy
--
Dr Andy Parkins, M Eng (hons), MIET
andyparkins@gmail.com
next prev parent reply other threads:[~2007-06-22 15:19 UTC|newest]
Thread overview: 44+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-06-21 3:06 Basename matching during rename/copy detection Shawn O. Pearce
2007-06-21 3:13 ` Junio C Hamano
2007-06-21 8:00 ` Andy Parkins
2007-06-21 8:07 ` Junio C Hamano
2007-06-21 9:50 ` Andy Parkins
2007-06-21 11:52 ` Johannes Schindelin
2007-06-21 12:44 ` Andy Parkins
2007-06-21 12:53 ` Matthieu Moy
2007-06-21 13:10 ` Jeff King
2007-06-21 13:18 ` Johannes Schindelin
2007-06-21 13:25 ` Matthieu Moy
2007-06-21 13:52 ` Johannes Schindelin
2007-06-21 15:37 ` Steven Grimm
2007-06-21 15:53 ` Johannes Schindelin
2007-06-21 16:57 ` Steven Grimm
2007-06-21 13:22 ` Johannes Schindelin
2007-06-21 3:42 ` Linus Torvalds
2007-06-21 11:52 ` [PATCH] diffcore-rename: favour identical basenames Johannes Schindelin
2007-06-21 13:19 ` Jeff King
2007-06-21 14:03 ` Johannes Schindelin
2007-06-21 16:20 ` Linus Torvalds
2007-06-21 17:52 ` Junio C Hamano
2007-06-21 18:24 ` Linus Torvalds
2007-06-22 15:19 ` Andy Parkins [this message]
2007-06-22 15:28 ` Johannes Schindelin
2007-06-22 17:51 ` Aidan Van Dyk
2007-06-22 1:14 ` Johannes Schindelin
2007-06-22 5:41 ` Jeff King
2007-06-22 10:22 ` Johannes Schindelin
2007-06-22 7:17 ` Johannes Sixt
2007-06-22 10:39 ` Johannes Schindelin
2007-06-22 10:52 ` 100% (was: [PATCH] diffcore-rename: favour identical basenames) David Kastrup
2007-06-22 12:49 ` Johannes Schindelin
[not found] ` <86abusi1fw.fsf@lola.quinscape.zz>
2007-06-23 1:31 ` 100% Johannes Schindelin
2007-06-23 10:18 ` 100% René Scharfe
2007-06-23 10:56 ` 100% Johannes Schindelin
2007-06-23 11:41 ` 100% René Scharfe
2007-06-23 12:00 ` 100% Johannes Schindelin
2007-06-23 12:11 ` 100% René Scharfe
2007-06-23 12:21 ` 100% Johannes Schindelin
2007-06-24 22:23 ` 100% René Scharfe
2007-06-23 19:33 ` 100% Junio C Hamano
2007-06-23 20:41 ` 100% Johannes Schindelin
2007-06-23 5:44 ` [PATCH] diffcore-rename: favour identical basenames Junio C Hamano
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=200706221619.30521.andyparkins@gmail.com \
--to=andyparkins@gmail.com \
--cc=Johannes.Schindelin@gmx.de \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=govindsalinas@yahoo.com \
--cc=peff@peff.net \
--cc=spearce@spearce.org \
--cc=torvalds@linux-foundation.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).