summaryrefslogtreecommitdiff
path: root/apply.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@ppc970.osdl.org>2005-06-08 15:11:47 (GMT)
committerLinus Torvalds <torvalds@ppc970.osdl.org>2005-06-08 15:11:47 (GMT)
commitaf3f929f9546268ede788b4217ff0b6a655ab62a (patch)
tree40db5eeb058ce126f5ae6ee6f0d9e0898abd9109 /apply.c
parentfcbfd5a6b2c87dc5ecd1d6c4e94c56eebf44c8ac (diff)
downloadgit-af3f929f9546268ede788b4217ff0b6a655ab62a.zip
git-af3f929f9546268ede788b4217ff0b6a655ab62a.tar.gz
git-af3f929f9546268ede788b4217ff0b6a655ab62a.tar.bz2
git-apply: creatign empty files is nonfatal
(but it will result in a warning)
Diffstat (limited to 'apply.c')
-rw-r--r--apply.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/apply.c b/apply.c
index 1f48ef9..20c41c5 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;