development/git
development/git
1
0
Fork 0
mirror of https://github.com/git/git synced 2024-10-06 00:29:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

git-apply: fix rename header parsing

Browse source 
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.
This commit is contained in:
Linus Torvalds 2005-06-05 14:26:50 -07:00
parent a48e1d67e1
commit 33f4d087a9
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
apply.c
View file

@ -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;
}