diff options
| author | Tatyana Krasnukha <tatyana@synopsys.com> | 2018-02-15 03:29:34 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-02-15 22:09:02 +0300 |
| commit | e454ad4becff73588b1b3cc24dba3a0e740c7f7c (patch) | |
| tree | e15d28dc555858b6227d1b2ca96276ded66cd697 /t/t4135-apply-weird-filenames.sh | |
| parent | f16ef7bd4c37fba8c030b87610f646a1fce5d52d (diff) | |
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 <tatyana@synopsys.com>
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t4135-apply-weird-filenames.sh')
| -rwxr-xr-x | t/t4135-apply-weird-filenames.sh | 2 |
1 files changed, 1 insertions, 1 deletions
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 |