development/vscode
development/vscode
1
0
Fork 0
mirror of https://github.com/Microsoft/vscode synced 2024-08-27 13:00:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

Git - fix discard changes when the repository does not have an initial commit (#169397)

Browse source
This commit is contained in:
Ladislau Szomoru 2022-12-16 14:47:25 +01:00 committed by GitHub
parent cbf23d1500
commit c180a08350
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 10 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
extensions/git/src/api/git.d.ts vendored
View file

@ -352,5 +352,6 @@ export const enum GitErrorCodes {
UnknownPath = 'UnknownPath',
EmptyCommitMessage = 'EmptyCommitMessage',
BranchFastForwardRejected = 'BranchFastForwardRejected',
BranchNotYetBorn = 'BranchNotYetBorn',
TagConflict = 'TagConflict'
}

2
extensions/git/src/git.ts
View file

@ -1455,6 +1455,8 @@ export class Repository {
if (/Please,? commit your changes or stash them/.test(err.stderr || '')) {
err.gitErrorCode = GitErrorCodes.DirtyWorkTree;
err.gitTreeish = treeish;
} else if (/You are on a branch yet to be born/.test(err.stderr || '')) {
err.gitErrorCode = GitErrorCodes.BranchNotYetBorn;
}
throw err;

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

@ -1457,7 +1457,13 @@ export class Repository implements Disposable {
});
await this.repository.clean(toClean);
await this.repository.checkout('', toCheckout);
try {
await this.repository.checkout('', toCheckout);
} catch (err) {
if (err.gitErrorCode !== GitErrorCodes.BranchNotYetBorn) {
throw err;
}
}
await this.repository.updateSubmodules(submodulesToUpdate);
this.closeDiffEditors([], [...toClean, ...toCheckout]);