Merge branch 'jc/apply-beyond-symlink' into maint
authorJunio C Hamano <gitster@pobox.com>
Sat, 14 Mar 2015 05:56:02 +0000 (22:56 -0700)
committerJunio C Hamano <gitster@pobox.com>
Sat, 14 Mar 2015 05:56:02 +0000 (22:56 -0700)
"git apply" was not very careful about reading from, removing,
updating and creating paths outside the working tree (under
--index/--cached) or the current directory (when used as a
replacement for GNU patch).

* jc/apply-beyond-symlink:
apply: do not touch a file beyond a symbolic link
apply: do not read from beyond a symbolic link
apply: do not read from the filesystem under --index
apply: reject input that touches outside the working area

1  2 
builtin/apply.c
diff --cc builtin/apply.c
Simple merge