From cb95038137e9e66fc6a6b4a0e8db62bcc521b709 Mon Sep 17 00:00:00 2001 From: Johannes Schindelin Date: Thu, 17 Mar 2022 10:15:15 +0100 Subject: Git 2.30.3 Signed-off-by: Johannes Schindelin --- Documentation/RelNotes/2.30.3.txt | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) create mode 100644 Documentation/RelNotes/2.30.3.txt (limited to 'Documentation/RelNotes') diff --git a/Documentation/RelNotes/2.30.3.txt b/Documentation/RelNotes/2.30.3.txt new file mode 100644 index 0000000000..31b2a4daa6 --- /dev/null +++ b/Documentation/RelNotes/2.30.3.txt @@ -0,0 +1,24 @@ +Git v2.30.2 Release Notes +========================= + +This release addresses the security issue CVE-2022-24765. + +Fixes since v2.30.2 +------------------- + + * Build fix on Windows. + + * Fix `GIT_CEILING_DIRECTORIES` with Windows-style root directories. + + * CVE-2022-24765: + On multi-user machines, Git users might find themselves + unexpectedly in a Git worktree, e.g. when another user created a + repository in `C:\.git`, in a mounted network drive or in a + scratch space. Merely having a Git-aware prompt that runs `git + status` (or `git diff`) and navigating to a directory which is + supposedly not a Git worktree, or opening such a directory in an + editor or IDE such as VS Code or Atom, will potentially run + commands defined by that other user. + +Credit for finding this vulnerability goes to 俞晨东; The fix was +authored by Johannes Schindelin. -- cgit v1.2.3 From 44de39c45c65134f4a6e02e7702a5db70a71041d Mon Sep 17 00:00:00 2001 From: Johannes Schindelin Date: Thu, 17 Mar 2022 10:57:32 +0100 Subject: Git 2.31.2 Signed-off-by: Johannes Schindelin --- Documentation/RelNotes/2.31.2.txt | 6 ++++++ GIT-VERSION-GEN | 2 +- RelNotes | 2 +- 3 files changed, 8 insertions(+), 2 deletions(-) create mode 100644 Documentation/RelNotes/2.31.2.txt (limited to 'Documentation/RelNotes') diff --git a/Documentation/RelNotes/2.31.2.txt b/Documentation/RelNotes/2.31.2.txt new file mode 100644 index 0000000000..aa13a5b022 --- /dev/null +++ b/Documentation/RelNotes/2.31.2.txt @@ -0,0 +1,6 @@ +Git v2.31.2 Release Notes +========================= + +This release merges up the fixes that appear in v2.30.3 to address +the security issue CVE-2022-24765; see the release notes for that +version for details. diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN index 36ab53e153..2498affd30 100755 --- a/GIT-VERSION-GEN +++ b/GIT-VERSION-GEN @@ -1,7 +1,7 @@ #!/bin/sh GVF=GIT-VERSION-FILE -DEF_VER=v2.31.1 +DEF_VER=v2.31.2 LF=' ' diff --git a/RelNotes b/RelNotes index 07f22a5d65..dff85391eb 120000 --- a/RelNotes +++ b/RelNotes @@ -1 +1 @@ -Documentation/RelNotes/2.31.1.txt \ No newline at end of file +Documentation/RelNotes/2.31.2.txt \ No newline at end of file -- cgit v1.2.3 From 9bcd7a8ecac1c9196bc927647bd06c38ec1feabe Mon Sep 17 00:00:00 2001 From: Johannes Schindelin Date: Thu, 17 Mar 2022 10:57:38 +0100 Subject: Git 2.32.1 Signed-off-by: Johannes Schindelin --- Documentation/RelNotes/2.32.1.txt | 6 ++++++ GIT-VERSION-GEN | 2 +- RelNotes | 2 +- 3 files changed, 8 insertions(+), 2 deletions(-) create mode 100644 Documentation/RelNotes/2.32.1.txt (limited to 'Documentation/RelNotes') diff --git a/Documentation/RelNotes/2.32.1.txt b/Documentation/RelNotes/2.32.1.txt new file mode 100644 index 0000000000..7dcca13b92 --- /dev/null +++ b/Documentation/RelNotes/2.32.1.txt @@ -0,0 +1,6 @@ +Git v2.32.1 Release Notes +========================= + +This release merges up the fixes that appear in v2.30.3 and +v2.31.2 to address the security issue CVE-2022-24765; see the +release notes for these versions for details. diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN index 9c125f298a..c462040198 100755 --- a/GIT-VERSION-GEN +++ b/GIT-VERSION-GEN @@ -1,7 +1,7 @@ #!/bin/sh GVF=GIT-VERSION-FILE -DEF_VER=v2.32.0 +DEF_VER=v2.32.1 LF=' ' diff --git a/RelNotes b/RelNotes index aece21e8a4..da84ed1cd7 120000 --- a/RelNotes +++ b/RelNotes @@ -1 +1 @@ -Documentation/RelNotes/2.32.0.txt \ No newline at end of file +Documentation/RelNotes/2.32.1.txt \ No newline at end of file -- cgit v1.2.3 From 87ed4fc046840706138d46e0033a009e74c3887a Mon Sep 17 00:00:00 2001 From: Johannes Schindelin Date: Thu, 17 Mar 2022 10:57:44 +0100 Subject: 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 (limited to 'Documentation/RelNotes') 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 -- cgit v1.2.3 From 4d0b43aa765a0056c88381eea862364c95e358ca Mon Sep 17 00:00:00 2001 From: Johannes Schindelin Date: Thu, 17 Mar 2022 10:57:52 +0100 Subject: Git 2.34.2 Signed-off-by: Johannes Schindelin --- Documentation/RelNotes/2.34.2.txt | 6 ++++++ GIT-VERSION-GEN | 2 +- RelNotes | 2 +- 3 files changed, 8 insertions(+), 2 deletions(-) create mode 100644 Documentation/RelNotes/2.34.2.txt (limited to 'Documentation/RelNotes') diff --git a/Documentation/RelNotes/2.34.2.txt b/Documentation/RelNotes/2.34.2.txt new file mode 100644 index 0000000000..0c32cd844b --- /dev/null +++ b/Documentation/RelNotes/2.34.2.txt @@ -0,0 +1,6 @@ +Git v2.34.2 Release Notes +========================= + +This release merges up the fixes that appear in v2.30.3, v2.31.2, +v2.32.1 and v2.33.2 to address the security issue CVE-2022-24765; +see the release notes for these versions for details. diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN index 991308dfaf..81dd339513 100755 --- a/GIT-VERSION-GEN +++ b/GIT-VERSION-GEN @@ -1,7 +1,7 @@ #!/bin/sh GVF=GIT-VERSION-FILE -DEF_VER=v2.34.1 +DEF_VER=v2.34.2 LF=' ' diff --git a/RelNotes b/RelNotes index 30a5e48971..01d62667bf 120000 --- a/RelNotes +++ b/RelNotes @@ -1 +1 @@ -Documentation/RelNotes/2.34.1.txt \ No newline at end of file +Documentation/RelNotes/2.34.2.txt \ No newline at end of file -- cgit v1.2.3 From 53ef17d3ee0f7fcb151f428ee3bd736b8046825f Mon Sep 17 00:00:00 2001 From: Johannes Schindelin Date: Thu, 17 Mar 2022 10:58:00 +0100 Subject: Git 2.35.2 Signed-off-by: Johannes Schindelin --- Documentation/RelNotes/2.35.2.txt | 7 +++++++ GIT-VERSION-GEN | 2 +- RelNotes | 2 +- 3 files changed, 9 insertions(+), 2 deletions(-) create mode 100644 Documentation/RelNotes/2.35.2.txt (limited to 'Documentation/RelNotes') diff --git a/Documentation/RelNotes/2.35.2.txt b/Documentation/RelNotes/2.35.2.txt new file mode 100644 index 0000000000..290bfa9ea4 --- /dev/null +++ b/Documentation/RelNotes/2.35.2.txt @@ -0,0 +1,7 @@ +Git v2.35.2 Release Notes +========================= + +This release merges up the fixes that appear in v2.30.3, +v2.31.2, v2.32.1, v2.33.2 and v2.34.2 to address the security +issue CVE-2022-24765; see the release notes for these versions +for details. diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN index b3cf1ff939..3a7a9f0438 100755 --- a/GIT-VERSION-GEN +++ b/GIT-VERSION-GEN @@ -1,7 +1,7 @@ #!/bin/sh GVF=GIT-VERSION-FILE -DEF_VER=v2.35.1 +DEF_VER=v2.35.2 LF=' ' diff --git a/RelNotes b/RelNotes index d7b83df043..286559e32e 120000 --- a/RelNotes +++ b/RelNotes @@ -1 +1 @@ -Documentation/RelNotes/2.35.1.txt \ No newline at end of file +Documentation/RelNotes/2.35.2.txt \ No newline at end of file -- cgit v1.2.3 From 11cfe552610386954886543f5de87dcc49ad5735 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Mon, 11 Apr 2022 21:27:02 -0700 Subject: Git 2.36-rc2 Signed-off-by: Junio C Hamano --- Documentation/RelNotes/2.36.0.txt | 2 ++ GIT-VERSION-GEN | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) (limited to 'Documentation/RelNotes') diff --git a/Documentation/RelNotes/2.36.0.txt b/Documentation/RelNotes/2.36.0.txt index 8da5b2e1e7..d61ade21e2 100644 --- a/Documentation/RelNotes/2.36.0.txt +++ b/Documentation/RelNotes/2.36.0.txt @@ -397,6 +397,8 @@ Fixes since v2.35 entry it moved. (merge b7f9130a06 vd/mv-refresh-stat later to maint). + * Fix for CVE-2022-24765 has been merged up from 2.35.2 and others. + * Other code cleanup, docfix, build fix, etc. (merge cfc5cf428b jc/find-header later to maint). (merge 40e7cfdd46 jh/p4-fix-use-of-process-error-exception later to maint). diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN index 1c5f645167..9252e0430d 100755 --- a/GIT-VERSION-GEN +++ b/GIT-VERSION-GEN @@ -1,7 +1,7 @@ #!/bin/sh GVF=GIT-VERSION-FILE -DEF_VER=v2.36.0-rc1 +DEF_VER=v2.36.0-rc2 LF=' ' -- cgit v1.2.3