From: Linus Torvalds <torvalds@ppc970.osdl.org>
Date: Wed, 8 Jun 2005 15:11:47 +0000 (-0700)
Subject: git-apply: creatign empty files is nonfatal
X-Git-Tag: v0.99~317
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=af3f929f9546268ede788b4217ff0b6a655ab62a;p=git.git

git-apply: creatign empty files is nonfatal

(but it will result in a warning)
---

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;