#143 New setting git-graph.useMailmap enables the use of .mailmap fil…

…es when displaying author & committer names and email addresses.

package.json

@@ -357,6 +357,11 @@
 					],
 					"default": "colour",
 					"description": "Specifies the colour theme of the icon displayed on the Git Graph tab."
+				},
+				"git-graph.useMailmap": {
+					"type": "boolean",
+					"default": false,
+					"markdownDescription": "Respect [.mailmap](https://git-scm.com/docs/git-check-mailmap#_mapping_authors) files when displaying author & committer names and email addresses."
 				}
 			}
 		},

src/config.ts

@@ -140,6 +140,10 @@ class Config {
 		return this.config.get('tabIconColourTheme', 'colour');
 	}
 
+	public useMailmap() {
+		return this.config.get('useMailmap', false);
+	}
+
 	public gitPath(): string | null {
 		return vscode.workspace.getConfiguration('git').get('path', null);
 	}

src/dataSource.ts

@@ -34,9 +34,11 @@ export class DataSource {
 	}
 
 	public generateGitCommandFormats() {
-		let dateType = getConfig().dateType() === 'Author Date' ? '%at' : '%ct';
-		this.gitLogFormat = ['%H', '%P', '%an', '%ae', dateType, '%s'].join(GIT_LOG_SEPARATOR);
-		this.gitCommitDetailsFormat = ['%H', '%P', '%an', '%ae', dateType, '%cn'].join(GIT_LOG_SEPARATOR) + '%n%B';
+		const config = getConfig();
+		let dateType = config.dateType() === 'Author Date' ? '%at' : '%ct';
+		let useMailmap = config.useMailmap();
+		this.gitLogFormat = ['%H', '%P', useMailmap ? '%aN' : '%an', useMailmap ? '%aE' : '%ae', dateType, '%s'].join(GIT_LOG_SEPARATOR);
+		this.gitCommitDetailsFormat = ['%H', '%P', useMailmap ? '%aN' : '%an', useMailmap ? '%aE' : '%ae', dateType, useMailmap ? '%cN' : '%cn'].join(GIT_LOG_SEPARATOR) + '%n%B';
 	}
 
 	public dispose() {

src/extension.ts

@@ -84,7 +84,7 @@ export async function activate(context: vscode.ExtensionContext) {
 		vscode.workspace.onDidChangeConfiguration(e => {
 			if (e.affectsConfiguration('git-graph.showStatusBarItem')) {
 				statusBarItem.refresh();
-			} else if (e.affectsConfiguration('git-graph.dateType')) {
+			} else if (e.affectsConfiguration('git-graph.dateType') || e.affectsConfiguration('git-graph.useMailmap')) {
 				dataSource.generateGitCommandFormats();
 			} else if (e.affectsConfiguration('git-graph.maxDepthOfRepoSearch')) {
 				repoManager.maxDepthOfRepoSearchChanged();