Skip to content

Commit

Permalink
Merge branch 'release/1.3.9' into main
Browse files Browse the repository at this point in the history
  • Loading branch information
Serhioromano committed May 18, 2022
2 parents 8b55684 + a901bb6 commit c43d6bd
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 3 deletions.
3 changes: 2 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,9 @@

All notable changes to the "gitflow" extension will be documented in this file.

## [1.3.6] 05/18/2022
## [1.3.9] 05/18/2022

- add - replace spaces in branch name with `_`
- fix - tmp dir for message files on release and hotfix
- add - parameter `gitflow.path` to manually set gitflow executable.
- fix - Changelog automatic update month is 1 less.
Expand Down
3 changes: 2 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -163,7 +163,8 @@ GitHub CLI will automatically store your Git credentials for you when you choose

## Changelog

- 1.3.6
- 1.3.9
- add - replace spaces in branch name with `_`
- fix - tmp dir for message files on release and hotfix
- add - parameter `gitflow.path` to manually set gitflow executable.
- fix - Month updated in changelog one month less.
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"name": "vscode-gitflow",
"displayName": "Git Flow",
"description": "Git-Flow support for VS Code",
"version": "1.3.8",
"version": "1.3.9",
"engines": {
"vscode": "^1.64.0"
},
Expand Down
1 change: 1 addition & 0 deletions src/ViewBranches.ts
Original file line number Diff line number Diff line change
Expand Up @@ -313,6 +313,7 @@ export class TreeViewBranches implements vscode.TreeDataProvider<Flow> {
if (name === undefined) {
return;
}
name = name.replace(/\s/igm, "_");
if (name?.match(/^([a-zA-Z0-9\_\-\.]*)$/) === null) {
vscode.window.showErrorMessage(`${feature} name have to match [a-zA-Z0-9_\\-\\.]*`);
return;
Expand Down

0 comments on commit c43d6bd

Please sign in to comment.