ckaczor/vscode-gitlens
1
0
Fork 0
mirror of https://github.com/ckaczor/vscode-gitlens.git synced 2026-01-14 10:03:15 -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

6
src/quickPicks/commitFileDetails.ts
View File

@@ -1,5 +1,5 @@
'use strict';
import { Arrays } from '../system';
import { Arrays, Iterables } from '../system';
import { QuickPickItem, QuickPickOptions, Uri, window } from 'vscode';
import { Commands, Keyboard, KeyNoopCommand } from '../commands';
import { GitCommit, GitLogCommit, GitService, GitUri, IGitLog } from '../gitService';
@@ -118,6 +118,10 @@ export class CommitFileDetailsQuickPick {
if (!c || !c.previousSha) {
log = await git.getLogForFile(commit.repoPath, uri.fsPath, commit.sha, git.config.advanced.maxQuickHistory);
c = log && log.commits.get(commit.sha);
// Since we exclude merge commits in file log, just grab the first returned commit
if (!c && commit.isMerge) {
c = Iterables.first(log.commits.values());
}
if (c) {
// Copy over next info, since it is trustworthy at this point