From: "David D. Kilzer" <ddkilzer@kilzer.net>
To: Jonathan Nieder <jrnieder@gmail.com>
Cc: Junio C Hamano <gitster@pobox.com>,
git@vger.kernel.org,
Johannes Schindelin <johannes.schindelin@gmx.de>
Subject: Re: [PATCH 0/5] Fix rebase with file move when diff.renames = copies
Date: Fri, 23 Jul 2010 11:47:12 -0700 (PDT) [thread overview]
Message-ID: <624201.94995.qm@web30003.mail.mud.yahoo.com> (raw)
In-Reply-To: <20100723170103.GA2507@burratino>
On Fri, July 23, 2010 at 10:01:03 AM, Jonathan Nieder wrote:
> David D. Kilzer wrote:
>
> > My original patch in <http://marc.info/?l=git&m=122635667614099&w=2>
>addressed
>
> > this in builtin-apply.c, but Junio didn't like this approach as noted in
> > <http://marc.info/?l=git&m=122636097120953&w=2>.
>
> Got it. This patch just treats the symptoms in my opinion, and if
> you read Junio’s message carefully, I think he was also suggesting
> that git apply should still be fixed.
Thanks! At the time I needed to fix the issue and continue working. I didn't
have time to investigate it further (which is why it sat for about 18 months).
> Something like this series would fix both. Please feel free to pick
> it up and take it in whatever direction you like.
Is this comment to me or Junio? As a part-time contributor, I'm not sure what
my options are here. :)
> Hope that helps.
Yes! Thanks again!
Dave
next prev parent reply other threads:[~2010-07-23 18:47 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
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 ` David D. Kilzer [this message]
2010-07-24 21:59 ` [PATCH 0/5] Fix rebase with file move when diff.renames = copies 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=624201.94995.qm@web30003.mail.mud.yahoo.com \
--to=ddkilzer@kilzer.net \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=johannes.schindelin@gmx.de \
--cc=jrnieder@gmail.com \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.