Fixes missing committer email in logs

Fixes committer name matching for current user

Author: eamodio

src/git/parsers/blameParser.ts

@@ -9,6 +9,7 @@ import { GitFileIndexStatus } from '../models/fileStatus';
 import { uncommitted } from '../models/revision';
 import type { GitUser } from '../models/user';
 import { isUncommitted } from '../utils/revision.utils';
+import { isUserMatch } from '../utils/user.utils';
 
 interface BlameEntry {
 	sha: string;
@@ -202,20 +203,12 @@ function parseBlameEntry(
 	commits: Map<string, GitCommit>,
 	authors: Map<string, GitBlameAuthor>,
 	lines: GitCommitLine[],
-	currentUser: { name?: string; email?: string } | undefined,
+	currentUser: GitUser | undefined,
 ) {
 	let commit = commits.get(entry.sha);
 	if (commit == null) {
 		if (entry.author != null) {
-			if (
-				currentUser != null &&
-				// Name or e-mail is configured
-				(currentUser.name != null || currentUser.email != null) &&
-				// Match on name if configured
-				(currentUser.name == null || currentUser.name === entry.author) &&
-				// Match on email if configured
-				(currentUser.email == null || currentUser.email === entry.authorEmail)
-			) {
+			if (isUserMatch(currentUser, entry.author, entry.authorEmail)) {
 				entry.author = 'You';
 			}
 
@@ -229,6 +222,10 @@ function parseBlameEntry(
 			}
 		}
 
+		if (entry.committer != null && isUserMatch(currentUser, entry.committer, entry.committerEmail)) {
+			entry.committer = 'You';
+		}
+
 		commit = new GitCommit(
 			container,
 			repoPath,

src/git/parsers/logParser.ts

@@ -587,7 +587,7 @@ export function parseGitLog(
 				break;
 
 			case 109: // 'm': // committer-mail
-				entry.committedDate = line.substring(4);
+				entry.committerEmail = line.substring(4);
 				break;
 
 			case 99: // 'c': // committer-date
@@ -844,16 +844,12 @@ function parseLogEntry(
 	stashes: Map<string, GitStashCommit> | undefined,
 ): void {
 	if (commit == null) {
-		if (entry.author != null) {
-			if (isUserMatch(currentUser, entry.author, entry.authorEmail)) {
-				entry.author = 'You';
-			}
+		if (entry.author != null && isUserMatch(currentUser, entry.author, entry.authorEmail)) {
+			entry.author = 'You';
 		}
 
-		if (entry.committer != null) {
-			if (isUserMatch(currentUser, entry.committer, entry.committerEmail)) {
-				entry.committer = 'You';
-			}
+		if (entry.committer != null && isUserMatch(currentUser, entry.committer, entry.committerEmail)) {
+			entry.committer = 'You';
 		}
 
 		const originalFileName = entry.originalPath ?? (relativeFileName !== entry.path ? entry.path : undefined);