| commit | 18e2b1cfc80990719275d7b08e6e50f3e8cbc902 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Thu, 2 Mar 2023 23:13:30 +0000 (2 15:13 -0800) | ||
| committer | Johannes Schindelin <johannes.schindelin@gmx.de> | |
| Mon, 17 Apr 2023 19:15:41 +0000 (17 21:15 +0200) | ||
| tree | 20f2b635d2612ce45fd88178a0012d884f667795 | treesnapshot (tar.gz zip) |
| parent | 2f3b28f27234a0130583131a6785c44e3dd1cac4 | commitdiff |
| parent | 9db05711c98efc14f414d4c87135a34c13586e0b | commitdiff |
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>
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>