projects
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Removed bogus "<snap>" identifier.
[git.git]
/
apply.c
diff --git
a/apply.c
b/apply.c
index
179b3bb
..
2da225a
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)