Git 2.21.3

This merges up the security fix from v2.17.5.

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

diff --cc Documentation/RelNotes/2.21.3.txt
index 0000000000000000000000000000000000000000,0000000000000000000000000000000000000000..2ca0aa5c62afe5ec687176e462ed26ca18353ea9
new file mode 100644 (file)
--- /dev/null
--- /dev/null
+++ b/Documentation/RelNotes/2.21.3.txt
@@@ -1,0 -1,0 +1,5 @@@
++Git v2.21.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 9fa5ebbceaa42e740d5579b878d7a26fafc60bba,de22ee7afad73d406a8b09a817f0199600575b0b..372758ca62c06bd9201402ffd93637f59b636ca2
--- 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.21.2
 -DEF_VER=v2.20.4
++DEF_VER=v2.21.3
  
  LF='
  '

diff --cc RelNotes
index ce5750f0473e7a4efd17aea5df25f9182afa10e0,0c3010e688fb348f36382db3cc00036fb7d69883..19f6240eec7227ac2a99ad1fa2ebdda82f83fb1f
--- 1/RelNotes
--- 2/RelNotes
+++ b/RelNotes
@@@ -1,1 -1,1 +1,1 @@@
- Documentation/RelNotes/2.21.2.txt
 -Documentation/RelNotes/2.20.4.txt
++Documentation/RelNotes/2.21.3.txt

diff --cc fsck.c
Simple merge

diff --cc http.c
Simple merge