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

extensions/git/src/commands.ts

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

extensions/git/src/git.ts

@@ -998,20 +998,26 @@ export class Repository {
 			throw commitErr;
 		}
 
+		let userName, userEmail;
+
 		try {
-			await this.run(['config', '--get-all', 'user.name']);
-		} catch (err) {
-			err.gitErrorCode = GitErrorCodes.NoUserNameConfigured;
-			throw err;
-		}
+			const nameResult = await this.run(['config', '--get-all', 'user.name']);
+			userName = nameResult.stdout.split('\n').filter(l => !!l).pop();
+		} catch (err) { }
 
 		try {
-			await this.run(['config', '--get-all', 'user.email']);
-		} catch (err) {
-			err.gitErrorCode = GitErrorCodes.NoUserEmailConfigured;
-			throw err;
+			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;
 	}