From b6221cc7118fc49a89f2cc0cf8d587cc80f94185 Mon Sep 17 00:00:00 2001
From: Ryan Wright <rwright2899@gmail.com>
Date: Fri, 21 Feb 2025 16:06:53 +0000
Subject: [PATCH] Retain cwd when invoking login shell

---
 src/vs/platform/terminal/node/terminalProfiles.ts | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/vs/platform/terminal/node/terminalProfiles.ts b/src/vs/platform/terminal/node/terminalProfiles.ts
index fd5d14a71fb63..2a9b99681e79a 100644
--- a/src/vs/platform/terminal/node/terminalProfiles.ts
+++ b/src/vs/platform/terminal/node/terminalProfiles.ts
@@ -122,6 +122,8 @@ async function detectAvailableWindowsProfiles(
 				{ path: `${process.env['HOMEDRIVE']}\\cygwin\\bin\\bash.exe`, isUnsafe: true }
 			],
 			args: ['--login'],
+			// CHERE_INVOKING retains current working directory
+			env: { CHERE_INVOKING: '1' },
 			isAutoDetected: true
 		});
 		detectedProfiles.set('bash (MSYS2)', {