git-apply: do not barf when updating an originally empty file.

Signed-off-by: Junio C Hamano <junkio@cox.net>
19 years ago · 3103cf9e1e
1 changed files with 1 additions and 1 deletions
--- a/apply.c
+++ b/apply.c
@ -834,7 +834,7 @@ static int parse_fragment(char *line, unsigned long size, struct patch *patch, s
				@@ -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)