Re: [PATCH] Fix rebase with file move when diff.renames = copies

From: David D. Kilzer <ddkilzer@kilzer.net>
Date: Jul 22, 2010, 00:22 UTC
Message-ID: <76360.2655.qm@web30004.mail.mud.yahoo.com>
In-Reply-To: <7vpqygijqt.fsf@alter.siamese.dyndns.org>

On Wed, July 21, 2010 at 2:54:18 PM, Junio C Hamano wrote:

Show 13 quoted lines

> "David D. Kilzer" <ddkilzer@kilzer.net>  writes:
> 
> > The bug is that git rebase does not disable diff.renames  when it runs
> > format-patch internally to feed into "am -3".  The fix  is simply to
> > include a --no-renames argument to format-patch to override  any local
> > diff.renames setting.
> >
> > Fix by Junio C  Hamano.  Test case by David D. Kilzer.
> >
> > Signed-off-by: David  D. Kilzer <ddkilzer@kilzer.net>
> 
> Hmm, I  actully do not recall doing this patch, even though I think what it
> does  probably makes sense.

Yeah, it was a while ago (Nov 11, 2008):

<http://marc.info/?l=git&m=122636263923046&w=2>

Sorry for the delay, but the issue still affects me.  :)

Dave