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

Junio C Hamano · Junio C Hamano · commit 3103cf9e1e09 · 2006-03-22T00:21:07.000-08:00
Signed-off-by: Junio C Hamano &lt;junkio@cox.net&gt;
diff --git 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)

Original file line number	Diff line number	Diff line change
`@@ -834,7 +834,7 @@ static int parse_fragment(char line, unsigned long size, struct patch patch, s`
`834`	`834`	`patch->new_name = NULL;`
`835`	`835`	`}`
`836`	`836`
`837`		`- if (patch->is_new != !oldlines)`
	`837`	`+ if (patch->is_new && oldlines)`
`838`	`838`	`return error("new file depends on old contents");`
`839`	`839`	`if (patch->is_delete != !newlines) {`
`840`	`840`	`if (newlines)`