Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-04-23 18:19:12 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge commit 'refs/pull/58174/head' of github.com:Microsoft/vscode into pr/58174

Browse Source
This commit is contained in:
Joao Moreno
2018-09-13 17:20:52 +02:00
parent 583f9e19c7 8d147f35b7
commit a6985d76b2
2 changed files with 24 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
extensions/git/src/commands.ts
View File

@@ -1860,6 +1860,14 @@ export class CommandCenter {
type = 'warning';
options.modal = false;
break;
case GitErrorCodes.NoUserNameConfigured:
case GitErrorCodes.NoUserEmailConfigured:
message = localize('missing user info', "Make sure that user.email and user.name are configured correctly.\n\n{0}\n{1}\n\n{2}\n{3}",
"current user.email: " + err.userEmail || "",
"current user.name: " + err.userName || "",
"git config --global user.email \"you@example.com\"",
"git config --global user.name \"Your Name\"");
break;
default:
const hint = (err.stderr || err.message || String(err))
.replace(/^error: /mi, '')

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

@@ -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;
}