Git 2.22.4

This merges up the security fix from v2.17.5.

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

diff --cc Documentation/RelNotes/2.22.4.txt
index 0000000000000000000000000000000000000000,0000000000000000000000000000000000000000..8b5f3e3f3740a6920f7be13d318dfa7b6a2900a0
new file mode 100644 (file)
--- /dev/null
--- /dev/null
+++ b/Documentation/RelNotes/2.22.4.txt
@@@ -1,0 -1,0 +1,5 @@@
++Git v2.22.4 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 e3c9d78890dc219f6e830e6604fbbc10d2b8bc75,372758ca62c06bd9201402ffd93637f59b636ca2..8acd429ebd8cc09b0e4eb0173c1eb1a0a6077668
--- 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.22.3
 -DEF_VER=v2.21.3
++DEF_VER=v2.22.4
  
  LF='
  '

diff --cc RelNotes
index 6c1853bf38552d8e19d541d05941643f9f92a426,19f6240eec7227ac2a99ad1fa2ebdda82f83fb1f..09c7750f25167aa029a87e614ddc0a00776c845b
--- 1/RelNotes
--- 2/RelNotes
+++ b/RelNotes
@@@ -1,1 -1,1 +1,1 @@@
- Documentation/RelNotes/2.22.3.txt
 -Documentation/RelNotes/2.21.3.txt
++Documentation/RelNotes/2.22.4.txt

diff --cc fsck.c
Simple merge

diff --cc http.c
Simple merge

diff --cc t/t5550-http-fetch-dumb.sh
Simple merge