From 87ed4fc046840706138d46e0033a009e74c3887a Mon Sep 17 00:00:00 2001 From: Johannes Schindelin Date: Thu, 17 Mar 2022 10:57:44 +0100 Subject: [PATCH] Git 2.33.2 Signed-off-by: Johannes Schindelin --- Documentation/RelNotes/2.33.2.txt | 15 +++++++++++++++ GIT-VERSION-GEN | 2 +- RelNotes | 2 +- 3 files changed, 17 insertions(+), 2 deletions(-) create mode 100644 Documentation/RelNotes/2.33.2.txt diff --git a/Documentation/RelNotes/2.33.2.txt b/Documentation/RelNotes/2.33.2.txt new file mode 100644 index 0000000000..e504489d61 --- /dev/null +++ b/Documentation/RelNotes/2.33.2.txt @@ -0,0 +1,15 @@ +Git v2.33.2 Release Notes +========================= + +This release merges up the fixes that appear in v2.30.3, v2.31.2 +and v2.32.1 to address the security issue CVE-2022-24765; see +the release notes for these versions for details. + +In addition, it contains the following fixes: + + * Squelch over-eager warning message added during this cycle. + + * A bug in "git rebase -r" has been fixed. + + * One CI task based on Fedora image noticed a not-quite-kosher + construct recently, which has been corrected. diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN index 11aac6e397..d81eab5f00 100755 --- a/GIT-VERSION-GEN +++ b/GIT-VERSION-GEN @@ -1,7 +1,7 @@ #!/bin/sh GVF=GIT-VERSION-FILE -DEF_VER=v2.33.1 +DEF_VER=v2.33.2 LF=' ' diff --git a/RelNotes b/RelNotes index 567659e5a3..8e79de2efe 120000 --- a/RelNotes +++ b/RelNotes @@ -1 +1 @@ -Documentation/RelNotes/2.33.1.txt \ No newline at end of file +Documentation/RelNotes/2.33.2.txt \ No newline at end of file -- 2.39.2