Git 2.23-rc0

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

diff --git a/Documentation/RelNotes/2.23.0.txt b/Documentation/RelNotes/2.23.0.txt
index 5cae42b7afc44ac5358da9a8d81e4c9482219218..9896599b2f3a4bb559dd3db52bfdea461ac3a69b 100644 (file)
--- a/Documentation/RelNotes/2.23.0.txt
+++ b/Documentation/RelNotes/2.23.0.txt
@@ -378,6 +378,11 @@ Fixes since v2.22
    having to consult the other end, which has been corrected.
    (merge 2581ea3d31 es/local-atomic-push-failure-with-http later to maint).
 
    having to consult the other end, which has been corrected.
    (merge 2581ea3d31 es/local-atomic-push-failure-with-http later to maint).
 

+ * 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.
+   (merge b777f3fd61 jk/xdiff-clamp-funcname-context-index later to maint).
+

  * Other code cleanup, docfix, build fix, etc.
    (merge f547101b26 es/git-debugger-doc later to maint).
    (merge 7877ac3d7b js/bisect-helper-check-get-oid-return-value later to maint).
  * Other code cleanup, docfix, build fix, etc.
    (merge f547101b26 es/git-debugger-doc later to maint).
    (merge 7877ac3d7b js/bisect-helper-check-get-oid-return-value later to maint).

diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN
index 122f6479ef9f772f575ecb673e0f960900526fc1..a0766f64edab484347dfe6b2627a3d35493c0928 100755 (executable)
--- a/GIT-VERSION-GEN
+++ b/GIT-VERSION-GEN
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 GVF=GIT-VERSION-FILE
 #!/bin/sh
 
 GVF=GIT-VERSION-FILE

-DEF_VER=v2.22.GIT
+DEF_VER=v2.23.0-rc0

 
 LF='
 '
 
 LF='
 '