Git 2.22.1

Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/Documentation/RelNotes/2.22.1.txt b/Documentation/RelNotes/2.22.1.txt
index 76dd8fb578b54ab66044518bad521b0c53a8a61c..432762f270fa9844d0a20e3708f5f5dc8a3b931e 100644 (file)
--- a/Documentation/RelNotes/2.22.1.txt
+++ b/Documentation/RelNotes/2.22.1.txt
@@ -143,5 +143,8 @@ Fixes since v2.22
    coding guidelines document did not talk about them and instead had
    a blanket ban against them.
 
+ * The internal diff machinery can be made to read out of bounds while
+   looking for --funcion-context line in a corner case, which has been
+   corrected.
 
 Also contains various documentation updates, code clean-ups and minor fixups.

diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN
index 67f86b3e678b20ed2558ae6350b3d8138c88d28d..ac51bac07b4a0c991a31e31c3eaf86c96400c268 100755 (executable)
--- a/GIT-VERSION-GEN
+++ b/GIT-VERSION-GEN
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 GVF=GIT-VERSION-FILE
-DEF_VER=v2.22.0
+DEF_VER=v2.22.1
 
 LF='
 '