Merge branch 'tk/apply-dev-null-verify-name-fix' into next
authorJunio C Hamano <gitster@pobox.com>
Wed, 21 Feb 2018 23:41:17 +0000 (15:41 -0800)
committerJunio C Hamano <gitster@pobox.com>
Wed, 21 Feb 2018 23:41:17 +0000 (15:41 -0800)
commitdab449203bf1bf587da40bc45af8639bb9503717
tree22283fdcb9280b738480ad12922b454aec071117
parent9aec46d4040b311b705b01efda8251e486620387
parente454ad4becff73588b1b3cc24dba3a0e740c7f7c
Merge branch 'tk/apply-dev-null-verify-name-fix' into next

Many places in "git apply" knew that "/dev/null" that signals
"there is no such file on this side of the diff" can be followed by
whitespace and garbage when parsing a patch, except for one, which
made an otherwise valid patch (e.g. ones from subversion) rejected.

* tk/apply-dev-null-verify-name-fix:
  apply: handle Subversion diffs with /dev/null gracefully
  apply: demonstrate a problem applying svn diffs
apply.c