Skip to content

Commit a543a47

Browse files
committed
Fixes #576 - fails to load with older versions of git
1 parent b93790a commit a543a47

File tree

3 files changed

+4
-2
lines changed

3 files changed

+4
-2
lines changed

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/) and this p
88

99
### Fixed
1010

11+
- Fixes [#576](https://github.com/eamodio/vscode-gitlens/issues/576) — Fails to load with older versions of git
1112
- Fixes an issue where the _Copy Commit Message to Clipboard_ command fails (and probably others too) — a regression caused by the attempted fix for [#568](https://github.com/eamodio/vscode-gitlens/issues/565)
1213

1314
## [9.0.2] - 2018-12-05

src/git/git.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,8 @@ const GitWarnings = {
6969
mustRunInWorkTree: /this operation must be run in a work tree/i,
7070
patchWithConflicts: /Applied patch to \'.*?\' with conflicts/i,
7171
noRemoteRepositorySpecified: /No remote repository specified\./i,
72-
remoteConnectionError: /Could not read from remote repository/i
72+
remoteConnectionError: /Could not read from remote repository/i,
73+
notAGitCommand: /\'.+\' is not a git command/i
7374
};
7475

7576
export enum GitErrorHandling {

src/git/gitService.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1132,7 +1132,7 @@ export class GitService implements Disposable {
11321132
const author = `${user.name} <${user.email}>`;
11331133
// Check if there is a mailmap for the current user
11341134
const mappedAuthor = await Git.check_mailmap(repoPath, author);
1135-
if (author !== mappedAuthor) {
1135+
if (mappedAuthor != null && mappedAuthor.length !== 0 && author !== mappedAuthor) {
11361136
match = mappedAuthorRegex.exec(mappedAuthor);
11371137
if (match != null) {
11381138
[, user.name, user.email] = match;

0 commit comments

Comments
 (0)