Skip to content

Commit e503a4e

Browse files
committed
Fixes missing worktree remove on Windows
1 parent 48a1886 commit e503a4e

File tree

2 files changed

+2
-1
lines changed

2 files changed

+2
-1
lines changed

src/env/node/git/git.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -82,6 +82,7 @@ export const GitErrors = {
8282
noMergeBase: /no merge base/i,
8383
noRemoteRepositorySpecified: /No remote repository specified\./i,
8484
notAValidObjectName: /Not a valid object name/i,
85+
notAWorkingTree: /'(.*?)' is not a working tree/i,
8586
noUserNameConfigured: /Please tell me who you are\./i,
8687
invalidLineCount: /file .+? has only \d+ lines/i,
8788
uncommittedChanges: /contains modified or untracked files/i,

src/env/node/git/localGitProvider.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5700,7 +5700,7 @@ export class LocalGitProvider implements GitProvider, Disposable {
57005700
);
57015701

57025702
try {
5703-
await this.git.worktree__remove(repoPath, path, options);
5703+
await this.git.worktree__remove(repoPath, normalizePath(path), options);
57045704
} catch (ex) {
57055705
Logger.error(ex, scope);
57065706

0 commit comments

Comments
 (0)