Fixes #1890 loads untracked files in stashes

Author: eamodio

CHANGELOG.md

@@ -16,6 +16,10 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/) and this p
 
 - Changes local repositories to be considered public rather than private for GitLens+ features (so only a free account would be required)
 
+### Fixed
+
+- Fixes [#1890](https://github.com/gitkraken/vscode-gitlens/issues/1890) - can no longer see untracked files in stashes
+
 ## [12.0.1] - 2022-03-03
 
 ### Added

src/git/models/commit.ts

@@ -35,7 +35,7 @@ export class GitCommit implements GitRevisionReference {
 			commit.message != null &&
 			commit.files != null &&
 			commit.parents.length !== 0 &&
-			(!commit.stashName || commit._stashUntrackedFilesLoaded)
+			(commit.refType !== 'stash' || commit._stashUntrackedFilesLoaded)
 		);
 	}
 
@@ -189,36 +189,42 @@ export class GitCommit implements GitRevisionReference {
 		if (this.isUncommitted || GitCommit.hasFullDetails(this)) return;
 
 		const [commitResult, untrackedResult] = await Promise.allSettled([
-			this.container.git.getCommit(this.repoPath, this.sha),
+			this.refType !== 'stash' ? this.container.git.getCommit(this.repoPath, this.sha) : undefined,
 			// Check for any untracked files -- since git doesn't return them via `git stash list` :(
 			// See https://stackoverflow.com/questions/12681529/
-			this.stashName ? this.container.git.getCommit(this.repoPath, `${this.stashName}^3`) : undefined,
+			this.refType === 'stash' && !this._stashUntrackedFilesLoaded
+				? this.container.git.getCommit(this.repoPath, `${this.stashName}^3`)
+				: undefined,
 			this.getPreviousSha(),
 		]);
-		if (commitResult.status !== 'fulfilled' || commitResult.value == null) return;
-
-		let commit = commitResult.value;
-		this.parents.push(...(commit.parents ?? []));
-		this._summary = commit.summary;
-		this._message = commit.message;
-		this._files = commit.files as GitFileChange[];
-
-		if (this._file != null) {
-			const file = this._files.find(f => f.path === this._file!.path);
-			if (file != null) {
-				this._file = new GitFileChange(
-					file.repoPath,
-					file.path,
-					file.status,
-					file.originalPath ?? this._file.originalPath,
-					file.previousSha ?? this._file.previousSha,
-					file.stats ?? this._file.stats,
-				);
+
+		let commit;
+
+		if (commitResult.status === 'fulfilled' && commitResult.value != null) {
+			commit = commitResult.value;
+			this.parents.push(...(commit.parents ?? []));
+			this._summary = commit.summary;
+			this._message = commit.message;
+			this._files = commit.files as GitFileChange[];
+
+			if (this._file != null) {
+				const file = this._files.find(f => f.path === this._file!.path);
+				if (file != null) {
+					this._file = new GitFileChange(
+						file.repoPath,
+						file.path,
+						file.status,
+						file.originalPath ?? this._file.originalPath,
+						file.previousSha ?? this._file.previousSha,
+						file.stats ?? this._file.stats,
+					);
+				}
 			}
 		}
 
 		if (untrackedResult.status === 'fulfilled' && untrackedResult.value != null) {
 			this._stashUntrackedFilesLoaded = true;
+
 			commit = untrackedResult.value;
 			if (commit?.files != null && commit.files.length !== 0) {
 				// Since these files are untracked -- make them look that way
@@ -284,13 +290,13 @@ export class GitCommit implements GitRevisionReference {
 	async findFile(path: string): Promise<GitFileChange | undefined>;
 	async findFile(uri: Uri): Promise<GitFileChange | undefined>;
 	async findFile(pathOrUri: string | Uri): Promise<GitFileChange | undefined> {
-		if (this._files == null) {
+		if (!GitCommit.hasFullDetails(this)) {
 			await this.ensureFullDetails();
 			if (this._files == null) return undefined;
 		}
 
 		const relativePath = this.container.git.getRelativePath(pathOrUri, this.repoPath);
-		return this._files.find(f => f.path === relativePath);
+		return this._files?.find(f => f.path === relativePath);
 	}
 
 	formatDate(format?: string | null) {
@@ -406,13 +412,13 @@ export class GitCommit implements GitRevisionReference {
 	}
 
 	async getCommitsForFiles(): Promise<GitCommit[]> {
-		if (this._files == null) {
+		if (!GitCommit.hasFullDetails(this)) {
 			await this.ensureFullDetails();
 			if (this._files == null) return [];
 		}
 
-		const commits = this._files.map(f => this.with({ files: { file: f } }));
-		return commits;
+		const commits = this._files?.map(f => this.with({ files: { file: f } }));
+		return commits ?? [];
 	}
 
 	@memoize()