[PATCH 0/5] Fix rebase with file move when diff.renames = copies

From: Jonathan Nieder <jrnieder@gmail.com>
Date: Jul 23, 2010, 17:01 UTC
Message-ID: <20100723170103.GA2507@burratino>
In-Reply-To: <681325.9577.qm@web30002.mail.mud.yahoo.com>

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.

Something like this series would fix both. Please feel free to pick it up and take it in whatever direction you like.

Hope that helps.

Jonathan Nieder (3):
  t4150 (am): style tweaks
  t4150 (am): futureproof against failing tests
  t3400 (rebase): whitespace cleanup

Junio C Hamano (2):
  Teach "apply --index-info" to handle rename patches
  rebase: protect against diff.renames configuration

 builtin/apply.c   |    3 +-
 git-rebase.sh     |    2 +-
 t/t3400-rebase.sh |  204 ++++++++++++++++++--------------
 t/t4150-am.sh     |  334 +++++++++++++++++++++++++++++++++++-----------------
 t/test-lib.sh     |    4 +
 5 files changed, 345 insertions(+), 202 deletions(-)

-- 
1.7.2.rc3