]> git.ipfire.org Git - thirdparty/git.git/commit
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)
commit177bd65cf8601216e906ad56ceb6a46f57df22fa
treeb7eb2ee9a3fe8dced866b236e3031f70ca0d9d55
parent7676b86ec2a60078ed3eb274d208bf61be3e29a7
parente454ad4becff73588b1b3cc24dba3a0e740c7f7c
Merge branch 'tk/apply-dev-null-verify-name-fix'

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