Merge branch 'jc/apply-beyond-symlink'
authorJunio C Hamano <gitster@pobox.com>
Tue, 3 Mar 2015 22:37:01 +0000 (14:37 -0800)
committerJunio C Hamano <gitster@pobox.com>
Tue, 3 Mar 2015 22:37:01 +0000 (14:37 -0800)
"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
t/t4122-apply-symlink-inside.sh
diff --cc builtin/apply.c
Simple merge
Simple merge