From 3103cf9e1e09b0045a60542f24a2a1e4ed7b1237 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Wed, 22 Mar 2006 00:21:07 -0800 Subject: [PATCH] git-apply: do not barf when updating an originally empty file. Signed-off-by: Junio C Hamano --- apply.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apply.c b/apply.c index 179b3bbd..2da225a8 100644 --- a/apply.c +++ b/apply.c @@ -834,7 +834,7 @@ static int parse_fragment(char *line, unsigned long size, struct patch *patch, s patch->new_name = NULL; } - if (patch->is_new != !oldlines) + if (patch->is_new && oldlines) return error("new file depends on old contents"); if (patch->is_delete != !newlines) { if (newlines) -- 2.11.0