| commit | 5244a31039dbb3fe0d544fc56100d0ccbc653131 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Sat, 14 Mar 2015 05:56:02 +0000 (13 22:56 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Sat, 14 Mar 2015 05:56:02 +0000 (13 22:56 -0700) | ||
| tree | 47362bd61deab37c7dfb41d1b8189e31ccab5ccb | treesnapshot (tar.gz zip) |
| parent | 1469d9906833a8bd7d07a70ba8250c823716f20a | commitdiff |
| parent | e0d201b61601e17e24ed00cc3d16e8e25ca68596 | commitdiff |
Merge branch 'jc/apply-beyond-symlink' into maint
"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 |