ckaczor/vscode-gitlens
1
0
Fork 0
mirror of https://github.com/ckaczor/vscode-gitlens.git synced 2026-01-27 17:25:09 -05:00
Code Issues Packages Projects Releases Wiki Activity

Fixes issues with merge commits

Browse Source
This commit is contained in:
Eric Amodio
2017-03-26 13:50:04 -04:00
parent 8b5eed4714
commit 3856cfd110
6 changed files with 38 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/git/parsers/logParser.ts
View File

@@ -14,7 +14,7 @@ interface ILogEntry {
// committer?: string;
// committerDate?: string;
// parentSha?: string;
parentShas?: string[];
fileName?: string;
originalFileName?: string;
@@ -75,9 +75,9 @@ export class GitLogParser {
// entry.committerDate = lineParts.slice(1).join(' ').trim();
// break;
// case 'parent':
// entry.parentSha = lineParts.slice(1).join(' ').trim();
// break;
case 'parents':
entry.parentShas = lineParts.slice(1);
break;
case 'summary':
entry.summary = lineParts.slice(1).join(' ').trim();
@@ -227,6 +227,7 @@ export class GitLogParser {
}
commit = new GitLogCommit(type, repoPath, entry.sha, relativeFileName, entry.author, moment(entry.authorDate).toDate(), entry.summary, entry.status, entry.fileStatuses, undefined, entry.originalFileName);
commit.parentShas = entry.parentShas;
if (relativeFileName !== entry.fileName) {
commit.originalFileName = entry.fileName;