diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2015-03-13 22:56:02 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-03-13 22:56:02 -0700 |
| commit | 5244a31039dbb3fe0d544fc56100d0ccbc653131 (patch) | |
| tree | 47362bd61deab37c7dfb41d1b8189e31ccab5ccb /builtin/merge-recursive.c | |
| parent | Merge branch 'rs/daemon-interpolate' into maint (diff) | |
| parent | apply: do not touch a file beyond a symbolic link (diff) | |
| download | tgif-5244a31039dbb3fe0d544fc56100d0ccbc653131.tar.xz | |
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
Diffstat (limited to 'builtin/merge-recursive.c')
0 files changed, 0 insertions, 0 deletions