| commit | 71f19cce36103dce545e647e707be2e9a474139a | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Tue, 3 Mar 2015 22:37:01 +0000 (3 14:37 -0800) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Tue, 3 Mar 2015 22:37:01 +0000 (3 14:37 -0800) | ||
| tree | 153035d272b4410a57740adb66dad4187e22eed7 | treesnapshot (tar.gz zip) |
| parent | 7f4ba4b6e3ba7075ca6b379ba23fd3088cbe69a8 | commitdiff |
| parent | e0d201b61601e17e24ed00cc3d16e8e25ca68596 | commitdiff |
Merge branch 'jc/apply-beyond-symlink'
"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
"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
| builtin/apply.c | diff1 | diff2 | blobhistory |
| t/t4122-apply-symlink-inside.sh | diff1 | diff2 | blobhistory |