]> git.ipfire.org Git - thirdparty/git.git/commitdiff
Merge branch 'tk/apply-dev-null-verify-name-fix'
authorJunio C Hamano <gitster@pobox.com>
Wed, 28 Feb 2018 21:37:55 +0000 (13:37 -0800)
committerJunio C Hamano <gitster@pobox.com>
Wed, 28 Feb 2018 21:37:55 +0000 (13:37 -0800)
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

1  2 
apply.c

diff --cc apply.c
Simple merge