Git - handle the diff editor for untracked files now that we throw `F…

…ileNotFound` if the file does not exist (#236863)
microsoft · Dec 24, 2024 · 4fa5611 · 4fa5611
1 parent fca210c
commit 4fa5611
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/extensions/git/src/fileSystemProvider.ts b/extensions/git/src/fileSystemProvider.ts
@@ -192,7 +192,8 @@ export class GitFileSystemProvider implements FileSystemProvider {
 		try {
 			return await repository.buffer(sanitizeRef(ref, path, repository), path);
 		} catch (err) {
-			// File does not exist in git (ex: git ignored)
+			// File does not exist in git. This could be
+			// because the file is untracked or ignored
 			throw FileSystemError.FileNotFound();
 		}
 	}

diff --git a/extensions/git/src/repository.ts b/extensions/git/src/repository.ts
@@ -560,13 +560,11 @@ class ResourceCommandResolver {
 		switch (resource.type) {
 			case Status.INDEX_MODIFIED:
 			case Status.INDEX_RENAMED:
-			case Status.INDEX_ADDED:
 			case Status.INTENT_TO_RENAME:
 			case Status.TYPE_CHANGED:
 				return { original: toGitUri(resource.original, 'HEAD') };
 
 			case Status.MODIFIED:
-			case Status.UNTRACKED:
 				return { original: toGitUri(resource.resourceUri, '~') };
 
 			case Status.DELETED_BY_US: