git.99rst.org Git - git.git/commit

author	Junio C Hamano <redacted>
	Sat, 14 Mar 2015 05:56:02 +0000 (22:56 -0700)
committer	Junio C Hamano <redacted>
	Sat, 14 Mar 2015 05:56:02 +0000 (22:56 -0700)
commit	5244a31039dbb3fe0d544fc56100d0ccbc653131
tree	47362bd61deab37c7dfb41d1b8189e31ccab5ccb	tree \| snapshot
parent	1469d9906833a8bd7d07a70ba8250c823716f20a	commit \| diff
parent	e0d201b61601e17e24ed00cc3d16e8e25ca68596	commit \| diff

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