git: config.terminalAuthentication

joaomoreno · joaomoreno · commit 54d8261f9360 · 2020-04-27T14:57:47.000+02:00
diff --git a/extensions/git/package.json b/extensions/git/package.json
@@ -1665,6 +1665,12 @@
           "scope": "resource",
           "default": true,
           "description": "%config.showCommitInput%"
+        },
+        "git.terminalAuthentication": {
+          "type": "boolean",
+          "scope": "resource",
+          "default": true,
+          "description": "%config.terminalAuthentication%"
         }
       }
     },
diff --git a/extensions/git/package.nls.json b/extensions/git/package.nls.json
@@ -144,6 +144,7 @@
 	"config.untrackedChanges.separate": "Untracked changes appear separately in the Source Control view. They are also excluded from several actions.",
 	"config.untrackedChanges.hidden": "Untracked changes are hidden and excluded from several actions.",
 	"config.showCommitInput": "Controls whether to show the commit input in the Git source control panel.",
+	"config.terminalAuthentication": "Controls whether to enable VS Code to be the authentication handler for git processes spawned in the integrated terminal.",
 	"colors.added": "Color for added resources.",
 	"colors.modified": "Color for modified resources.",
 	"colors.deleted": "Color for deleted resources.",
diff --git a/extensions/git/src/ipc/ipcServer.ts b/extensions/git/src/ipc/ipcServer.ts
@@ -29,7 +29,6 @@ export interface IIPCHandler {
 
 export async function createIPCServer(context?: string): Promise<IIPCServer> {
 	const server = http.createServer();
-
 	const hash = crypto.createHash('sha1');
 
 	if (!context) {
diff --git a/extensions/git/src/main.ts b/extensions/git/src/main.ts
@@ -23,6 +23,7 @@ import * as fs from 'fs';
 import { GitTimelineProvider } from './timelineProvider';
 import { registerAPICommands } from './api/api1';
 import { GitHubCredentialProvider } from './github';
+import { TerminalEnvironmentManager } from './terminal';
 
 const deactivateTasks: { (): Promise<any>; }[] = [];
 
@@ -40,10 +41,8 @@ async function createModel(context: ExtensionContext, outputChannel: OutputChann
 	disposables.push(askpass);
 
 	const env = askpass.getEnv();
-
-	for (const name of Object.keys(env)) {
-		context.environmentVariableCollection.replace(name, env[name]);
-	}
+	const terminalEnvironmentManager = new TerminalEnvironmentManager(context, env);
+	disposables.push(terminalEnvironmentManager);
 
 	context.subscriptions.push(askpass.registerCredentialsProvider(new GitHubCredentialProvider()));
 

Original file line number	Diff line number	Diff line change
`@@ -1665,6 +1665,12 @@`
`1665`	`1665`	`"scope": "resource",`
`1666`	`1666`	`"default": true,`
`1667`	`1667`	`"description": "%config.showCommitInput%"`
	`1668`	`+ },`
	`1669`	`+ "git.terminalAuthentication": {`
	`1670`	`+ "type": "boolean",`
	`1671`	`+ "scope": "resource",`
	`1672`	`+ "default": true,`
	`1673`	`+ "description": "%config.terminalAuthentication%"`
`1668`	`1674`	`}`
`1669`	`1675`	`}`
`1670`	`1676`	`},`