git-apply: creatign empty files is nonfatal

(but it will result in a warning)

diff --git a/apply.c b/apply.c
index 1f48ef906fbf6c0f0a2efb6bf06599aa3081d30a..20c41c51433d18b21b914f0e700501c5244de6e0 100644 (file)
--- 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;