From: Jonathan Nieder <jrnieder@gmail.com>
Date: Sun, 19 Apr 2020 23:30:19 +0000 (-0700)
Subject: Git 2.22.4
X-Git-Tag: v2.22.4^0
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c9808fa014aa88cc306705d308d1d9065d567ddc;p=thirdparty%2Fgit.git

Git 2.22.4

This merges up the security fix from v2.17.5.

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

c9808fa014aa88cc306705d308d1d9065d567ddc
diff --cc Documentation/RelNotes/2.22.4.txt
index 0000000000,0000000000..8b5f3e3f37
new file mode 100644
--- /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 e3c9d78890,372758ca62..8acd429ebd
--- a/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 6c1853bf38,19f6240eec..09c7750f25
--- a/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