Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
git-apply: do not barf when updating an originally empty file.
author
Junio C Hamano
<junkio@cox.net>
Wed, 22 Mar 2006 08:21:07 +0000
(
00:21
-0800)
committer
Junio C Hamano
<junkio@cox.net>
Wed, 22 Mar 2006 08:21:07 +0000
(
00:21
-0800)
Signed-off-by: Junio C Hamano <junkio@cox.net>
apply.c
patch
|
blob
|
history
raw
|
patch
| inline |
side by side
(parent:
8c9e794
)
diff --git
a/apply.c
b/apply.c
index 179b3bbd00fc6da726491639920ba6540c9b3c71..2da225a8ecae356c1b3376d5a0671940f265509c 100644
(file)
--- 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)