summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2021-03-09 00:09:43 (GMT)
committerJunio C Hamano <gitster@pobox.com>2021-03-09 00:09:43 (GMT)
commit13d7ab6b5d7929825b626f050b62a11241ea4945 (patch)
tree36df888799ee586d2f0b1f8811ff8cd5866ae749
parent56a57652ef8e4ca2f108a8719b8caeed5e153c95 (diff)
downloadgit-13d7ab6b5d7929825b626f050b62a11241ea4945.zip
git-13d7ab6b5d7929825b626f050b62a11241ea4945.tar.gz
git-13d7ab6b5d7929825b626f050b62a11241ea4945.tar.bz2
Git 2.31-rc2v2.31.0-rc2
-rw-r--r--Documentation/RelNotes/2.31.0.txt2
-rwxr-xr-xGIT-VERSION-GEN2
2 files changed, 3 insertions, 1 deletions
diff --git a/Documentation/RelNotes/2.31.0.txt b/Documentation/RelNotes/2.31.0.txt
index cde22e8..cf0c7d8 100644
--- a/Documentation/RelNotes/2.31.0.txt
+++ b/Documentation/RelNotes/2.31.0.txt
@@ -16,6 +16,8 @@ Backward incompatible and other important changes
* The support for deprecated PCRE1 library has been dropped.
+ * Fixes for CVE-2021-21300 in Git 2.30.2 (and earlier) is included.
+
UI, Workflows & Features
diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN
index 7b99fe5..09df1b1 100755
--- a/GIT-VERSION-GEN
+++ b/GIT-VERSION-GEN
@@ -1,7 +1,7 @@
#!/bin/sh
GVF=GIT-VERSION-FILE
-DEF_VER=v2.31.0-rc1
+DEF_VER=v2.31.0-rc2
LF='
'