Re: [PATCH 2/2] apply: handle Subversion diffs with /dev/null gracefully

Johannes Schindelin writes: > } 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); > }

[PATCH 2/2] apply: handle Subversion diffs with /dev/null gracefully

From: Tatyana Krasnukha Subversion generates diffs that can contain lines like this one: --- /dev/null (nonexistent) Let's teach Git's apply machinery to handle such a line gracefully. This fixes https://github.com/git-for-windows/git/isues/1489 Signed-off-by: