Merge from vscode da3c97f3668393ebfcb9f8208d7616018d6d1859 (#5360)

This commit is contained in:
Anthony Dresser
2019-05-03 21:59:40 -07:00
committed by GitHub
parent 39f9c72390
commit df7645e4e5
12 changed files with 66 additions and 94 deletions

View File

@@ -306,6 +306,8 @@ function getGitErrorCode(stderr: string): string | undefined {
return GitErrorCodes.BranchAlreadyExists;
} else if (/'.+' is not a valid branch name/.test(stderr)) {
return GitErrorCodes.InvalidBranchName;
} else if (/Please,? commit your changes or stash them/.test(stderr)) {
return GitErrorCodes.DirtyWorkTree;
}
return undefined;