mirror of
https://github.com/microsoft/vscode.git
synced 2026-04-24 18:49:00 +01:00
Merge commit 'refs/pull/58174/head' of github.com:Microsoft/vscode into pr/58174
This commit is contained in:
@@ -998,20 +998,26 @@ export class Repository {
|
||||
throw commitErr;
|
||||
}
|
||||
|
||||
try {
|
||||
await this.run(['config', '--get-all', 'user.name']);
|
||||
} catch (err) {
|
||||
err.gitErrorCode = GitErrorCodes.NoUserNameConfigured;
|
||||
throw err;
|
||||
}
|
||||
let userName, userEmail;
|
||||
|
||||
try {
|
||||
await this.run(['config', '--get-all', 'user.email']);
|
||||
} catch (err) {
|
||||
err.gitErrorCode = GitErrorCodes.NoUserEmailConfigured;
|
||||
throw err;
|
||||
const nameResult = await this.run(['config', '--get-all', 'user.name']);
|
||||
userName = nameResult.stdout.split('\n').filter(l => !!l).pop();
|
||||
} catch (err) { }
|
||||
|
||||
try {
|
||||
const emailResult = await this.run(['config', '--get-all', 'user.email']);
|
||||
userEmail = emailResult.stdout.split('\n').filter(l => !!l).pop();
|
||||
} catch (err) { }
|
||||
|
||||
if (userName && userEmail) {
|
||||
throw commitErr;
|
||||
}
|
||||
|
||||
commitErr.gitErrorCode = !userName ? GitErrorCodes.NoUserNameConfigured : GitErrorCodes.NoUserEmailConfigured;
|
||||
commitErr.userName = userName;
|
||||
commitErr.userEmail = userEmail;
|
||||
|
||||
throw commitErr;
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user