]> git.ipfire.org Git - thirdparty/git.git/commitdiff
projects / thirdparty / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 2f3b28f 9db0571)
Merge branch 'js/apply-overwrite-rej-symlink-if-exists' into maint-2.30
authorJunio C Hamano <gitster@pobox.com>
Thu, 2 Mar 2023 23:13:30 +0000 (15:13 -0800)
committerJohannes Schindelin <johannes.schindelin@gmx.de>
Mon, 17 Apr 2023 19:15:41 +0000 (21:15 +0200)
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>

Trivial merge
Unnamed repository; edit this file 'description' to name the repository.