Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2025-12-24 12:19:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

skip auth only for auto fetch

Browse Source 
related to #72615
This commit is contained in:
Joao Moreno
2019-10-17 16:19:26 +02:00
parent 612b072362
commit f367d0fe20
4 changed files with 14 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
extensions/git/src/askpass-main.ts
View File

@@ -28,6 +28,10 @@ function main(argv: string[]): void {
return fatal('Missing pipe'); return fatal('Missing pipe');
} }
if (process.env['VSCODE_GIT_COMMAND'] === 'fetch' && !!process.env['VSCODE_GIT_FETCH_SILENT']) {
return fatal('Skip silent fetch commands');
}
const output = process.env['VSCODE_GIT_ASKPASS_PIPE'] as string; const output = process.env['VSCODE_GIT_ASKPASS_PIPE'] as string;
const socketPath = process.env['VSCODE_GIT_ASKPASS_HANDLE'] as string; const socketPath = process.env['VSCODE_GIT_ASKPASS_HANDLE'] as string;
const request = argv[2]; const request = argv[2];

2
extensions/git/src/autofetch.ts
View File

@@ -99,7 +99,7 @@ export class AutoFetcher {
} }
try { try {
await this.repository.fetchDefault(); await this.repository.fetchDefault({ silent: true });
} catch (err) { } catch (err) {
if (err.gitErrorCode === GitErrorCodes.AuthenticationFailed) { if (err.gitErrorCode === GitErrorCodes.AuthenticationFailed) {
this.disable(); this.disable();

9
extensions/git/src/git.ts
View File

@@ -1401,8 +1401,9 @@ export class Repository {
await this.run(args); await this.run(args);
} }
async fetch(options: { remote?: string, ref?: string, all?: boolean, prune?: boolean, depth?: number } = {}): Promise<void> { async fetch(options: { remote?: string, ref?: string, all?: boolean, prune?: boolean, depth?: number, silent?: boolean } = {}): Promise<void> {
const args = ['fetch']; const args = ['fetch'];
const spawnOptions: SpawnOptions = {};
if (options.remote) { if (options.remote) {
args.push(options.remote); args.push(options.remote);
@@ -1422,8 +1423,12 @@ export class Repository {
args.push(`--depth=${options.depth}`); args.push(`--depth=${options.depth}`);
} }
if (options.silent) {
spawnOptions.env = { 'VSCODE_GIT_FETCH_SILENT': 'true' };
}
try { try {
await this.run(args); await this.run(args, spawnOptions);
} catch (err) { } catch (err) {
if (/No remote repository specified\./.test(err.stderr || '')) { if (/No remote repository specified\./.test(err.stderr || '')) {
err.gitErrorCode = GitErrorCodes.NoRemoteRepositorySpecified; err.gitErrorCode = GitErrorCodes.NoRemoteRepositorySpecified;

4
extensions/git/src/repository.ts
View File

@@ -1054,8 +1054,8 @@ export class Repository implements Disposable {
} }
@throttle @throttle
async fetchDefault(): Promise<void> { async fetchDefault(options: { silent?: boolean } = {}): Promise<void> {
await this.run(Operation.Fetch, () => this.repository.fetch()); await this.run(Operation.Fetch, () => this.repository.fetch(options));
} }
@throttle @throttle