Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-02-24 19:56:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

SCM - quick diff should better handle untracked files (#236315)

Browse Source
This commit is contained in:
Ladislau Szomoru
2024-12-17 09:26:30 +01:00
committed by GitHub
parent 95386dec78
commit ca3ff9f564
2 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
extensions/git/src/repository.ts
View File

@@ -1035,7 +1035,13 @@ export class Repository implements Disposable {
}
// Ignore path that is inside a merge group
if (this.mergeGroup.resourceStates.some(r => r.resourceUri.path === uri.path)) {
if (this.mergeGroup.resourceStates.some(r => pathEquals(r.resourceUri.fsPath, uri.fsPath))) {
return undefined;
}
// Ignore path that is untracked
if (this.untrackedGroup.resourceStates.some(r => pathEquals(r.resourceUri.path, uri.path)) ||
this.workingTreeGroup.resourceStates.some(r => pathEquals(r.resourceUri.path, uri.path) && r.type === Status.UNTRACKED)) {
return undefined;
}

4
src/vs/workbench/contrib/scm/browser/quickDiffModel.ts
View File

@@ -214,10 +214,6 @@ export class QuickDiffModel extends Disposable {
return; // disposed
}
if (editorModels.every(editorModel => editorModel.textEditorModel.getValueLength() === 0)) {
result.changes = [];
}
this.setChanges(result.changes, result.mapChanges);
})
.catch(err => onUnexpectedError(err));