From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 3 Feb 2023 22:57:27 +0000 (-0800)
Subject: Merge branch 'ps/apply-beyond-symlink' into maint-2.30
X-Git-Tag: v2.30.8~1
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a3033a68ac3886d44ee378784ae242f25afc9970;p=thirdparty%2Fgit.git

Merge branch 'ps/apply-beyond-symlink' into maint-2.30

Fix a vulnerability (CVE-2023-23946) that allows crafted input to trick
`git apply` into writing files outside of the working tree.

* ps/apply-beyond-symlink:
  dir-iterator: prevent top-level symlinks without FOLLOW_SYMLINKS

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
---

a3033a68ac3886d44ee378784ae242f25afc9970