ckaczor/vscode-gitlens
1
0
Fork 0
mirror of https://github.com/ckaczor/vscode-gitlens.git synced 2026-01-16 01:25:42 -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

5
src/git/models/logCommit.ts
View File

@@ -12,6 +12,7 @@ export class GitLogCommit extends GitCommit {
fileStatuses: { status: GitStatusFileStatus, fileName: string, originalFileName?: string }[];
nextSha?: string;
nextFileName?: string;
parentShas: string[];
status: GitStatusFileStatus;
constructor(
@@ -43,6 +44,10 @@ export class GitLogCommit extends GitCommit {
}
}
get isMerge() {
return this.parentShas && this.parentShas.length > 1;
}
get nextShortSha() {
return this.nextSha && this.nextSha.substring(0, 8);
}