From f97f93537943ad29e618e758853f1ed14d4d4a4c Mon Sep 17 00:00:00 2001 From: Eric Amodio Date: Wed, 17 Apr 2019 03:00:54 -0400 Subject: [PATCH] Fixes #701 - adds missing --use-mailmap flag --- CHANGELOG.md | 1 + src/git/git.ts | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 264c1f5..ebe8503 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -17,6 +17,7 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/) and this p ### Fixed +- Fixes [#701](https://github.com/eamodio/vscode-gitlens/issues/701) - Contributors shows no commits for mailmapped committer name - Fixes issues with the _Line History_ view sometimes showing a duplicate and out of order commit - Fixes broken _Open File_ command on the root node of the _File History_ and _Line History_ views - Fixes broken _Open Revision_ command on status files of the _Repositories_ view diff --git a/src/git/git.ts b/src/git/git.ts index 00c86eb..41d6066 100644 --- a/src/git/git.ts +++ b/src/git/git.ts @@ -617,7 +617,7 @@ export class Git { static log(repoPath: string, options: { authors?: string[]; maxCount?: number; ref?: string; reverse?: boolean }) { const params = [...defaultLogParams, '--full-history', '-M', '-m']; if (options.authors) { - params.push(...options.authors.map(a => `--author=${a}`)); + params.push('--use-mailmap', ...options.authors.map(a => `--author=${a}`)); } if (options.maxCount && !options.reverse) { params.push(`-n${options.maxCount}`);