Fixes issue showing changes with untracked stashed files

Author: eamodio

CHANGELOG.md

@@ -7,6 +7,7 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/) and this p
 ## [Unreleased]
 ### Fixed
 - Fixes [#454](https://github.com/eamodio/vscode-gitlens/issues/454) - Search for string returns merge commits (unlike raw `git log -S`)
+- Fixes issue showing changes with untracked stashed files
 
 ## [8.5.2] - 2018-07-20
 ### Fixed

src/git/models/logCommit.ts

@@ -95,11 +95,18 @@ export class GitLogCommit extends GitCommit {
             status = fileNameOrStatus;
         }
 
+        let sha;
+        // If this is a stash commit with an untracked file
+        if (this.type === GitCommitType.Stash && status.status === '?') {
+            sha = `${this.sha}^3`;
+        }
+
         // If this isn't a single-file commit, we can't trust the previousSha
         const previousSha = this.isFile ? this.previousSha : `${this.sha}^`;
 
         return this.with({
             type: this.isStash ? GitCommitType.StashFile : GitCommitType.File,
+            sha: sha,
             fileName: status.fileName,
             originalFileName: status.originalFileName,
             previousSha: previousSha,

src/gitService.ts

@@ -1770,7 +1770,7 @@ export class GitService extends Disposable {
     }
 
     async resolveReference(repoPath: string, ref: string, uri?: Uri) {
-        if (!GitService.isResolveRequired(ref)) return ref;
+        if (!GitService.isResolveRequired(ref) || ref.endsWith('^3')) return ref;
 
         Logger.log(`resolveReference('${repoPath}', '${ref}', '${uri && uri.toString()}')`);