From af3f929f9546268ede788b4217ff0b6a655ab62a Mon Sep 17 00:00:00 2001 From: Linus Torvalds Date: Wed, 8 Jun 2005 08:11:47 -0700 Subject: [PATCH] git-apply: creatign empty files is nonfatal (but it will result in a warning) --- apply.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/apply.c b/apply.c index 1f48ef906..20c41c514 100644 --- a/apply.c +++ b/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; -- 2.26.2