mirror of
https://github.com/git/git
synced 2024-08-27 11:39:22 +00:00
git-apply: creatign empty files is nonfatal
(but it will result in a warning)
This commit is contained in:
parent
fcbfd5a6b2
commit
af3f929f95
7
apply.c
7
apply.c
|
@ -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;
|
||||
|
|
Loading…
Reference in a new issue