Re: [PATCH] diffcore-rename: favour identical basenames
- From
- Andy Parkins <andyparkins@gmail.com>
- Date
- Jun 22, 2007, 15:19 UTC
- Message-ID
- <200706221619.30521.andyparkins@gmail.com>
- In-Reply-To
- <alpine.LFD.0.98.0706210910390.3593@woody.linux-foundation.org>
On Thursday 2007 June 21, Linus Torvalds wrote:
Show 5 quoted lines
> 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