[PATCH 0/2] Teach `git apply` to accept Subversion-generated diffs

[Johannes Schindelin <johannes.schindelin@gmx.de>]

They are accepted already, almost. With one exception: the ---/+++ lines
contain not only the file names, but continue with a TAB and then the
revision (or "working copy" or "nonexistent") in parenthesis.

We already handle these lines, except in the case of /dev/null. Let's handle
the case gracefully where the diff contains a "--- /dev/null" line with a
trailing comment.

This contribution came in via Pull Request to Git for Windows, from a first
time contributor! Yes!


Johannes Schindelin (1):
  apply: demonstrate a problem applying svn diffs

Tatyana Krasnukha (1):
  apply: handle Subversion diffs with /dev/null gracefully

 apply.c                          |  2 +-
 t/t4135-apply-weird-filenames.sh | 17 +++++++++++++++++
 2 files changed, 18 insertions(+), 1 deletion(-)


base-commit: b2e45c695d09f6a31ce09347ae0a5d2cdfe9dd4e
Published-As: https://github.com/dscho/git/releases/tag/apply-svn-diff-v1
Fetch-It-Via: git fetch https://github.com/dscho/git apply-svn-diff-v1
-- 
2.16.1.windows.1