Git 2.23.3

This merges up the security fix from v2.17.5.

Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>

diff --cc Documentation/RelNotes/2.23.3.txt
index 0000000000000000000000000000000000000000,0000000000000000000000000000000000000000..2e35490137b7462968587b4e4212bf6b414f9016
new file mode 100644 (file)
--- /dev/null
--- /dev/null
+++ b/Documentation/RelNotes/2.23.3.txt
@@@ -1,0 -1,0 +1,5 @@@
++Git v2.23.3 Release Notes
++=========================
++
++This release merges the security fix that appears in v2.17.5; see
++the release notes for that version for details.

diff --cc GIT-VERSION-GEN
index 70721f0c1193a87c809806d1f2742a2e068d99c0,8acd429ebd8cc09b0e4eb0173c1eb1a0a6077668..aec2ca06d36c75926c67f4ce15826bf7f15bf01c
--- 1/GIT-VERSION-GEN
--- 2/GIT-VERSION-GEN
+++ b/GIT-VERSION-GEN
@@@ -1,7 -1,7 +1,7 @@@
  #!/bin/sh
  
  GVF=GIT-VERSION-FILE
- DEF_VER=v2.23.2
 -DEF_VER=v2.22.4
++DEF_VER=v2.23.3
  
  LF='
  '

diff --cc RelNotes
index 895970ffd8a9fb123c46f66914072e26d2fae564,09c7750f25167aa029a87e614ddc0a00776c845b..b4ed54889422a8eaf65671f69d35490ac89eb58d
--- 1/RelNotes
--- 2/RelNotes
+++ b/RelNotes
@@@ -1,1 -1,1 +1,1 @@@
- Documentation/RelNotes/2.23.2.txt
 -Documentation/RelNotes/2.22.4.txt
++Documentation/RelNotes/2.23.3.txt

diff --cc fsck.c
Simple merge