From 61ab5733fce098324deb390a74e81d98c06c3d3e Mon Sep 17 00:00:00 2001
From: Julien Poissonnier <julien@caffeine.lu>
Date: Sun, 13 Oct 2024 16:29:34 +0200
Subject: [PATCH 1/4] Convert paths in venv activate script when using Git Bash
 under Windows
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

With https://github.com/python/cpython/pull/112508 the check to converts paths when running on Windows was changed from using the non-posix environment variable `$OSTYPE` to using `uname` instead.

However this missed the fact that when running under Git Bash on Windows, uname reports `MINGW*` (`$OSTYPE` is still `msys`).

This results in `$PATH` being set to something like `D:\a\github-actions-shells\github-actions-shells\venv/Scripts:…`, instead of `/d/a/github-actions-shells/github-actions-shells/venv/Scripts`.

Notably, the Git Bash is the bash shell that’s used for GitHub Actions Windows runners, and ships with VSCode.
---
 Lib/venv/scripts/common/activate                              | 4 ++--
 .../Library/2024-10-13-15-04-58.gh-issue-125398.UW7Ndv.rst    | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)
 create mode 100644 Misc/NEWS.d/next/Library/2024-10-13-15-04-58.gh-issue-125398.UW7Ndv.rst

diff --git a/Lib/venv/scripts/common/activate b/Lib/venv/scripts/common/activate
index 4593799b7e9b0e..44f137672e9d2e 100644
--- a/Lib/venv/scripts/common/activate
+++ b/Lib/venv/scripts/common/activate
@@ -38,8 +38,8 @@ deactivate nondestructive
 
 # on Windows, a path can contain colons and backslashes and has to be converted:
 case "$(uname)" in
-    CYGWIN*|MSYS*)
-        # transform D:\path\to\venv to /d/path/to/venv on MSYS
+    CYGWIN*|MSYS*|MINGW*)
+        # transform D:\path\to\venv to /d/path/to/venv on MSYS and MINGW
         # and to /cygdrive/d/path/to/venv on Cygwin
         VIRTUAL_ENV=$(cygpath "__VENV_DIR__")
         export VIRTUAL_ENV
diff --git a/Misc/NEWS.d/next/Library/2024-10-13-15-04-58.gh-issue-125398.UW7Ndv.rst b/Misc/NEWS.d/next/Library/2024-10-13-15-04-58.gh-issue-125398.UW7Ndv.rst
new file mode 100644
index 00000000000000..557d712f9f75fd
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2024-10-13-15-04-58.gh-issue-125398.UW7Ndv.rst
@@ -0,0 +1 @@
+Fix the conversion of the VIRTUAL_ENV path in the activate script in :mod:`venv` when running in Git Bash for Windows.

From a81e9cd2e71db1838eb171c42017d86c8ba3a939 Mon Sep 17 00:00:00 2001
From: Julien <julien@caffeine.lu>
Date: Mon, 14 Oct 2024 08:56:35 +0200
Subject: [PATCH 2/4] Update
 Misc/NEWS.d/next/Library/2024-10-13-15-04-58.gh-issue-125398.UW7Ndv.rst

Co-authored-by: RUANG (Roy James) <longjinyii@outlook.com>
---
 .../next/Library/2024-10-13-15-04-58.gh-issue-125398.UW7Ndv.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Misc/NEWS.d/next/Library/2024-10-13-15-04-58.gh-issue-125398.UW7Ndv.rst b/Misc/NEWS.d/next/Library/2024-10-13-15-04-58.gh-issue-125398.UW7Ndv.rst
index 557d712f9f75fd..a7d35154fd599b 100644
--- a/Misc/NEWS.d/next/Library/2024-10-13-15-04-58.gh-issue-125398.UW7Ndv.rst
+++ b/Misc/NEWS.d/next/Library/2024-10-13-15-04-58.gh-issue-125398.UW7Ndv.rst
@@ -1 +1 @@
-Fix the conversion of the VIRTUAL_ENV path in the activate script in :mod:`venv` when running in Git Bash for Windows.
+Fix the conversion of the ``VIRTUAL_ENV`` path in the activate script in :mod:`venv` when running in Git Bash for Windows.

From 0879c4862369bfc75681070d3b38fb824f900e54 Mon Sep 17 00:00:00 2001
From: Vinay Sajip <vinay_sajip@yahoo.co.uk>
Date: Tue, 15 Oct 2024 19:35:19 +0100
Subject: [PATCH 3/4] Change to use the envvar role.

---
 .../next/Library/2024-10-13-15-04-58.gh-issue-125398.UW7Ndv.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Misc/NEWS.d/next/Library/2024-10-13-15-04-58.gh-issue-125398.UW7Ndv.rst b/Misc/NEWS.d/next/Library/2024-10-13-15-04-58.gh-issue-125398.UW7Ndv.rst
index a7d35154fd599b..69aa74f3a0fe0e 100644
--- a/Misc/NEWS.d/next/Library/2024-10-13-15-04-58.gh-issue-125398.UW7Ndv.rst
+++ b/Misc/NEWS.d/next/Library/2024-10-13-15-04-58.gh-issue-125398.UW7Ndv.rst
@@ -1 +1 @@
-Fix the conversion of the ``VIRTUAL_ENV`` path in the activate script in :mod:`venv` when running in Git Bash for Windows.
+Fix the conversion of the :envvar:`VIRTUAL_ENV` path in the activate script in :mod:`venv` when running in Git Bash for Windows.

From d47476d92c6cee13bddbf0809d824b5d8707adc8 Mon Sep 17 00:00:00 2001
From: Vinay Sajip <vinay_sajip@yahoo.co.uk>
Date: Wed, 16 Oct 2024 18:41:27 +0100
Subject: [PATCH 4/4] Try to circumvent doc linting error.

---
 .../next/Library/2024-10-13-15-04-58.gh-issue-125398.UW7Ndv.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Misc/NEWS.d/next/Library/2024-10-13-15-04-58.gh-issue-125398.UW7Ndv.rst b/Misc/NEWS.d/next/Library/2024-10-13-15-04-58.gh-issue-125398.UW7Ndv.rst
index 69aa74f3a0fe0e..a188b35e1fbdbc 100644
--- a/Misc/NEWS.d/next/Library/2024-10-13-15-04-58.gh-issue-125398.UW7Ndv.rst
+++ b/Misc/NEWS.d/next/Library/2024-10-13-15-04-58.gh-issue-125398.UW7Ndv.rst
@@ -1 +1 @@
-Fix the conversion of the :envvar:`VIRTUAL_ENV` path in the activate script in :mod:`venv` when running in Git Bash for Windows.
+Fix the conversion of the :envvar:`!VIRTUAL_ENV` path in the activate script in :mod:`venv` when running in Git Bash for Windows.