From: Linus Torvalds <torvalds@ppc970.osdl.org>
Date: Sun, 5 Jun 2005 21:26:50 +0000 (-0700)
Subject: git-apply: fix rename header parsing
X-Git-Tag: v0.99~357
X-Git-Url: https://git.octo.it/?a=commitdiff_plain;h=33f4d087a95a537095371a2fe02b96787518f389;hp=a48e1d67e167507091f25dc00e2bd6c280fa538e;p=git.git

git-apply: fix rename header parsing

It's not "rename from" and "rename to", it's "rename old" and "rename new".

Which is illogical and doesn't match the "copy from/to" case, but that's
life. Maybe Junio will fix it up one of these days.
---

diff --git a/apply.c b/apply.c
index cf55fda7..e02e760b 100644
--- a/apply.c
+++ b/apply.c
@@ -435,8 +435,8 @@ static int parse_git_header(char *line, int len, unsigned int size, struct patch
 			{ "new file mode ", gitdiff_newfile },
 			{ "copy from ", gitdiff_copysrc },
 			{ "copy to ", gitdiff_copydst },
-			{ "rename from ", gitdiff_renamesrc },
-			{ "rename to ", gitdiff_renamedst },
+			{ "rename old ", gitdiff_renamesrc },
+			{ "rename new ", gitdiff_renamedst },
 			{ "similarity index ", gitdiff_similarity },
 			{ "dissimilarity index ", gitdiff_dissimilarity },
 			{ "", gitdiff_unrecognized },
@@ -569,7 +569,7 @@ static int find_header(char *line, unsigned long size, int *hdrsize, struct patc
 			if (git_hdr_len < 0)
 				continue;
 			if (!patch->old_name && !patch->new_name)
-				die("git diff header lacks filename information");
+				die("git diff header lacks filename information (line %d)", linenr);
 			*hdrsize = git_hdr_len;
 			return offset;
 		}