mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

git-apply: use default name for mode change patches

Browse Source 
Pure mode changes won't have the file-name in the extended header lines,
so make sure we pick it up from the default name from the "diff --git"
line.
This commit is contained in:
Linus Torvalds
2005-06-17 15:23:40 -07:00
parent aeac668125
commit b7e8039a6f
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
apply.c
View File

@ -570,8 +570,11 @@ static int find_header(char *line, unsigned long size, int *hdrsize, struct patc
int git_hdr_len = parse_git_header(line, len, size, patch); int git_hdr_len = parse_git_header(line, len, size, patch);
if (git_hdr_len <= len) if (git_hdr_len <= len)
continue; continue;
if (!patch->old_name && !patch->new_name) if (!patch->old_name && !patch->new_name) {
if (!patch->def_name)
die("git diff header lacks filename information (line %d)", linenr); die("git diff header lacks filename information (line %d)", linenr);
patch->old_name = patch->new_name = patch->def_name;
}
*hdrsize = git_hdr_len; *hdrsize = git_hdr_len;
return offset; return offset;
} }