Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
apply: handle Subversion diffs with /dev/null gracefully
[gitweb.git]
/
apply.c
diff --git
a/apply.c
b/apply.c
index 0c7b25989cdf58b411190744c97d93450be9b53e..3aadbae30523d7f41140220363805da3fd593118 100644
(file)
--- a/
apply.c
+++ b/
apply.c
@@
-975,7
+975,7
@@
static int gitdiff_verify_name(struct apply_state *state,
}
free(another);
} else {
- if (!
starts_with(line, "/dev/null\n"
))
+ if (!
is_dev_null(line
))
return error(_("git apply: bad git-diff - expected /dev/null on line %d"), state->linenr);
}