Merge branch 'thierer-fix-changes-display-for-modified-files'

370376d8 · Joao Moreno · a31886c2 · 2fedc4c2 · 370376d8 · 370376d8
隐藏空白更改
内联并排

Showing with 2 addition and 2 deletion

extensions/git/src/commands.ts extensions/git/src/commands.ts +1 -1

extensions/git/src/contentProvider.ts extensions/git/src/contentProvider.ts +1 -1

未找到文件。
--- a/extensions/git/src/commands.ts
+++ b/extensions/git/src/commands.ts
@@ -209,7 +209,7 @@ export class CommandCenter {
 		try {
 			if (ref === '~') {
 				const uriString = uri.toString();
-				const [indexStatus] = repository.indexGroup.resourceStates.filter(r => r.original.toString() === uriString);
+				const [indexStatus] = repository.indexGroup.resourceStates.filter(r => r.resourceUri.toString() === uriString);
 				ref = indexStatus ? '' : 'HEAD';
 			}


--- a/extensions/git/src/contentProvider.ts
+++ b/extensions/git/src/contentProvider.ts
@@ -100,7 +100,7 @@ export class GitContentProvider {
 		if (ref === '~') {
 			const fileUri = Uri.file(path);
 			const uriString = fileUri.toString();
-			const [indexStatus] = repository.indexGroup.resourceStates.filter(r => r.original.toString() === uriString);
+			const [indexStatus] = repository.indexGroup.resourceStates.filter(r => r.resourceUri.toString() === uriString);
 			ref = indexStatus ? '' : 'HEAD';
 		}