Skip to content

Commit

Permalink
Merge branch 'release/1.3.16' into main
Browse files Browse the repository at this point in the history
  • Loading branch information
Serhioromano committed Aug 28, 2022
2 parents 0c8d4d4 + 5a9433c commit 3f0c3be
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 7 deletions.
10 changes: 5 additions & 5 deletions 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.15",
"version": "1.3.16",
"engines": {
"vscode": "^1.64.0"
},
Expand Down Expand Up @@ -742,16 +742,16 @@
]
}
},
"main": "./out/main.js",
"_main": "./out/extension.js",
"_main": "./out/main.js",
"main": "./out/extension.js",
"scripts": {
"vscode:prepublish": "npm run esbuild-base -- --minify",
"_vscode:prepublish": "npm run esbuild-base -- --minify",
"esbuild-base": "esbuild ./src/extension.ts --bundle --outfile=out/main.js --external:vscode --format=cjs --platform=node",
"esbuild": "npm run esbuild-base -- --sourcemap",
"esbuild-watch": "npm run esbuild-base -- --sourcemap --watch",
"watch": "tsc -watch -p ./",
"publish": "vsce package && gh release create $(node -pe \"require('./package.json')['version']\") --generate-notes \"./vscode-gitflow-$(node -pe \"require('./package.json')['version']\").vsix\" && vsce publish",
"_vscode:prepublish": "npm run compile",
"vscode:prepublish": "npm run compile",
"compile": "tsc -p ./",
"pretest": "npm run compile && npm run lint",
"lint": "eslint src --ext ts",
Expand Down
2 changes: 1 addition & 1 deletion src/ViewBranches.ts
Original file line number Diff line number Diff line change
Expand Up @@ -314,7 +314,7 @@ export class TreeViewBranches implements vscode.TreeDataProvider<Flow> {
return;
}
name = name.replace(/\s/igm, "_");
const checked = this.util.execSync(`git check-ref-format --branch ${name}`).trim();
const checked = this.util.execSync(`"${this.util.path}" check-ref-format --branch ${name}`).trim();

if (checked !== name) {
vscode.window.showErrorMessage(`Error creating a branch: ${checked}`);
Expand Down
2 changes: 1 addition & 1 deletion src/ViewVersions.ts
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ export class TreeViewVersions implements vscode.TreeDataProvider<Tag> {
let name = node?.label;
if (node === undefined) {
let tags = this.util
.execSync("git tag --sort=-v:refname")
.execSync(`"${this.util.path}" tag --sort=-v:refname`)
.split("\n")
.map((el) => el.trim())
.filter((el) => el !== "");
Expand Down

0 comments on commit 3f0c3be

Please sign in to comment.