Files
git/builtin
Junio C Hamano 18cdf802ca Teach "apply --index-info" to handle rename patches
With v1.5.3.2~14 (apply --index-info: fall back to current index for
mode changes, 2007-09-17), git apply learned to stop worrying
about the lack of diff index line when a file already present in the
current index had no content change.

But it still worries too much: for rename patches, it is checking
that both the old and new filename are present in the current
index.  This makes no sense, since a file rename generally
involves creating a file there was none before.

So just check the old filename.

Noticed while trying to use “git rebase” with diff.renames = copies.

[jn: add tests]

Reported-by: David D. Kilzer <ddkilzer@kilzer.net>
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2010-07-23 14:44:38 -07:00
..
2010-06-27 12:07:55 -07:00
2010-06-21 06:02:47 -07:00
2010-06-27 12:07:55 -07:00
2010-06-21 06:02:44 -07:00
2010-06-18 11:16:53 -07:00
2010-07-16 15:45:35 -07:00
2010-06-07 22:15:31 -07:00
2010-07-15 12:07:18 -07:00
2010-06-30 11:55:40 -07:00
2010-06-18 11:16:54 -07:00
2010-06-28 17:42:26 -07:00
2010-07-15 12:08:36 -07:00
2010-06-12 09:39:06 -07:00
2010-07-07 11:18:26 -07:00
2010-06-29 10:36:13 -07:00