mirror/ git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-06-19 19:29:12 +02:00
Code

git-apply: creatign empty files is nonfatal 

(but it will result in a warning)
This commit is contained in:
Linus Torvalds 2005-06-08 08:11:47 -07:00
parent fcbfd5a6b2
commit af3f929f95
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
apply.c
View File

@ -630,8 +630,11 @@ static int parse_fragment(char *line, unsigned long size, struct patch *patch, s
if (patch->is_new != !oldlines)
return error("new file depends on old contents");
if (patch->is_delete != !newlines)
return error("deleted file still has contents");
if (patch->is_delete != !newlines) {
if (newlines)
return error("deleted file still has contents");
fprintf(stderr, "** warning: file %s becomes empty but is not deleted\n", patch->new_name);
}
/* Parse the thing.. */
line += len;