From dc93841715dfa9a9cdda6f2c4a25eec831ea7aa0 Mon Sep 17 00:00:00 2001 From: Linus Torvalds Date: Sun, 5 Jun 2005 15:31:52 -0700 Subject: diff 'rename' format change. Clearly even Junio felt git "rename" header lines should say "from/to" instead of "old/new", since he wrote the documentation that way. This way it also matches "copy". git-apply will accept both versions, at least for a while. --- apply.c | 2 ++ 1 file changed, 2 insertions(+) (limited to 'apply.c') diff --git a/apply.c b/apply.c index ec63a0c1e0..1f48ef906f 100644 --- a/apply.c +++ b/apply.c @@ -437,6 +437,8 @@ static int parse_git_header(char *line, int len, unsigned int size, struct patch { "copy to ", gitdiff_copydst }, { "rename old ", gitdiff_renamesrc }, { "rename new ", gitdiff_renamedst }, + { "rename from ", gitdiff_renamesrc }, + { "rename to ", gitdiff_renamedst }, { "similarity index ", gitdiff_similarity }, { "dissimilarity index ", gitdiff_dissimilarity }, { "", gitdiff_unrecognized }, -- cgit v1.2.3