Do not overwrite users environment variables

Backfighter · web-flow · commit f8ff8a8d6ade · 2021-01-30T09:23:49.000+01:00
These environment variables are currently enforced by vscode and there is no way to overwrite them. Turning this arround allows the user to use a custom GIT_ASKPASS inside vscode (e.g. /usr/bin/ksshaskpass for kde wallet). Fixes #111839
diff --git a/extensions/git/src/askpass.ts b/extensions/git/src/askpass.ts
@@ -80,10 +80,10 @@ export class Askpass implements IIPCHandler {
 		}
 
 		return {
-			...this.ipc.getEnv(),
 			GIT_ASKPASS: path.join(__dirname, 'askpass.sh'),
 			VSCODE_GIT_ASKPASS_NODE: process.execPath,
-			VSCODE_GIT_ASKPASS_MAIN: path.join(__dirname, 'askpass-main.js')
+			VSCODE_GIT_ASKPASS_MAIN: path.join(__dirname, 'askpass-main.js'),
+			...this.ipc.getEnv()
 		};
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -80,10 +80,10 @@ export class Askpass implements IIPCHandler {`
`80`	`80`	`}`
`81`	`81`
`82`	`82`	`return {`
`83`		`- ...this.ipc.getEnv(),`
`84`	`83`	`GIT_ASKPASS: path.join(__dirname, 'askpass.sh'),`
`85`	`84`	`VSCODE_GIT_ASKPASS_NODE: process.execPath,`
`86`		`- VSCODE_GIT_ASKPASS_MAIN: path.join(__dirname, 'askpass-main.js')`
	`85`	`+ VSCODE_GIT_ASKPASS_MAIN: path.join(__dirname, 'askpass-main.js'),`
	`86`	`+ ...this.ipc.getEnv()`
`87`	`87`	`};`
`88`	`88`	`}`
`89`	`89`