diff options
author | Junio C Hamano <junkio@cox.net> | 2006-03-22 00:21:07 -0800 |
---|---|---|
committer | Junio C Hamano <junkio@cox.net> | 2006-03-22 00:21:07 -0800 |
commit | 3103cf9e1e09b0045a60542f24a2a1e4ed7b1237 (patch) | |
tree | 79d82d73b77441635eb328aae5e09e5345267450 /apply.c | |
parent | 8c9e7947c2a76fb21bda11816c544d50e271156d (diff) | |
download | git-3103cf9e1e09b0045a60542f24a2a1e4ed7b1237.tar.gz git-3103cf9e1e09b0045a60542f24a2a1e4ed7b1237.tar.xz |
git-apply: do not barf when updating an originally empty file.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'apply.c')
-rw-r--r-- | apply.c | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -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) |