From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 2 Mar 2023 23:13:30 +0000 (-0800)
Subject: Merge branch 'js/apply-overwrite-rej-symlink-if-exists' into maint-2.30
X-Git-Tag: v2.30.9~3
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=18e2b1cfc80990719275d7b08e6e50f3e8cbc902;p=thirdparty%2Fgit.git

Merge branch 'js/apply-overwrite-rej-symlink-if-exists' into maint-2.30

Address CVE-2023-25652 by deleting any existing `.rej` symbolic links
instead of following them.

* js/apply-overwrite-rej-symlink-if-exists:
  apply --reject: overwrite existing `.rej` symlink if it exists

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

18e2b1cfc80990719275d7b08e6e50f3e8cbc902