summaryrefslogtreecommitdiff
path: root/ll-merge.h
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2015-03-03 14:37:01 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2015-03-03 14:37:01 -0800
commit71f19cce36103dce545e647e707be2e9a474139a (patch)
tree153035d272b4410a57740adb66dad4187e22eed7 /ll-merge.h
parentPost 2.3 cyle (batch #5) (diff)
parentapply: do not touch a file beyond a symbolic link (diff)
downloadtgif-71f19cce36103dce545e647e707be2e9a474139a.tar.xz
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
Diffstat (limited to 'll-merge.h')
0 files changed, 0 insertions, 0 deletions