From: Tatyana Krasnukha Date: Thu, 15 Feb 2018 00:29:34 +0000 (+0100) Subject: apply: handle Subversion diffs with /dev/null gracefully X-Git-Tag: v2.17.0-rc0~56^2 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e454ad4becff73588b1b3cc24dba3a0e740c7f7c;p=thirdparty%2Fgit.git apply: handle Subversion diffs with /dev/null gracefully 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: Tatyana Krasnukha Signed-off-by: Johannes Schindelin Signed-off-by: Junio C Hamano --- diff --git a/apply.c b/apply.c index 0c7b25989c..3aadbae305 100644 --- 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); } diff --git a/t/t4135-apply-weird-filenames.sh b/t/t4135-apply-weird-filenames.sh index b14b808578..c7c688fcc4 100755 --- a/t/t4135-apply-weird-filenames.sh +++ b/t/t4135-apply-weird-filenames.sh @@ -100,7 +100,7 @@ deleted file mode 100644 - EOF -test_expect_failure 'apply handles a diff generated by Subversion' ' +test_expect_success 'apply handles a diff generated by Subversion' ' >Makefile && git apply -p2 diff-from-svn && test_path_is_missing Makefile