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

Deals with merge commits in next sha tracking

Browse Source
This commit is contained in:
Eric Amodio
2017-03-11 00:41:36 -05:00
parent a37a80d704
commit 1b21893d72
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/git/enrichers/logParserEnricher.ts
View File

@@ -202,7 +202,8 @@ export class GitLogParserEnricher implements IGitEnricher<IGitLog> {
if (recentCommit) {
recentCommit.previousSha = commit.sha;
commit.nextSha = recentCommit.sha;
// If the commit sha's match (merge commit), just forward it along
commit.nextSha = commit.sha !== recentCommit.sha ? recentCommit.sha : recentCommit.nextSha;
// Only add a filename if this is a file log
if (type === 'file') {
recentCommit.previousFileName = commit.originalFileName || commit.fileName;