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

This commit is contained in:
Joao Moreno
2018-09-13 17:20:52 +02:00
2 changed files with 24 additions and 10 deletions

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, '')