From: "David D. Kilzer" <ddkilzer@kilzer.net>
To: Junio C Hamano <gitster@pobox.com>
Cc: git@vger.kernel.org, Johannes Schindelin <johannes.schindelin@gmx.de>
Subject: Re: [PATCH] Fix rebase with file move when diff.renames = copies
Date: Wed, 21 Jul 2010 17:22:08 -0700 (PDT) [thread overview]
Message-ID: <76360.2655.qm@web30004.mail.mud.yahoo.com> (raw)
In-Reply-To: <7vpqygijqt.fsf@alter.siamese.dyndns.org>
On Wed, July 21, 2010 at 2:54:18 PM, Junio C Hamano wrote:
> "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
next prev parent reply other threads:[~2010-07-22 0:29 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-11-10 22:26 [PATCH] 3-way merge with file move fails when diff.renames = copies David D. Kilzer
2008-11-10 23:41 ` Johannes Schindelin
2008-11-10 23:53 ` [PATCH] Fix 3-way merge with file move " David D. Kilzer
2008-11-10 23:49 ` [PATCH] 3-way merge with file move fails " Junio C Hamano
2008-11-11 0:06 ` David D. Kilzer
2008-11-11 0:15 ` Junio C Hamano
2010-07-21 19:58 ` [PATCH] Fix rebase with file move " David D. Kilzer
2010-07-21 21:54 ` Junio C Hamano
2010-07-22 0:22 ` David D. Kilzer [this message]
2010-07-22 7:51 ` Jonathan Nieder
2010-07-22 21:59 ` David D. Kilzer
2010-07-23 17:01 ` [PATCH 0/5] " Jonathan Nieder
2010-07-23 17:03 ` [PATCH 1/5] t4150 (am): style tweaks Jonathan Nieder
2010-07-23 17:04 ` [PATCH 2/5] t4150 (am): futureproof against failing tests Jonathan Nieder
2010-07-23 17:04 ` [PATCH 3/5] Teach "apply --index-info" to handle rename patches Jonathan Nieder
2010-07-23 17:05 ` [PATCH 4/5] t3400 (rebase): whitespace cleanup Jonathan Nieder
2010-07-23 17:06 ` [PATCH 5/5] rebase: protect against diff.renames configuration Jonathan Nieder
2010-07-23 19:51 ` Sverre Rabbelier
2010-07-23 21:03 ` Junio C Hamano
2010-07-23 19:53 ` Sverre Rabbelier
2010-07-23 18:47 ` [PATCH 0/5] Fix rebase with file move when diff.renames = copies David D. Kilzer
2010-07-24 21:59 ` Jonathan Nieder
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=76360.2655.qm@web30004.mail.mud.yahoo.com \
--to=ddkilzer@kilzer.net \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=johannes.schindelin@gmx.de \
/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).