Skip to content

Commit 3f0c3be

Browse files
committed
Merge branch 'release/1.3.16' into main
2 parents 0c8d4d4 + 5a9433c commit 3f0c3be

File tree

3 files changed

+7
-7
lines changed

3 files changed

+7
-7
lines changed

package.json

+5-5
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"name": "vscode-gitflow",
33
"displayName": "Git Flow",
44
"description": "Git-Flow support for VS Code",
5-
"version": "1.3.15",
5+
"version": "1.3.16",
66
"engines": {
77
"vscode": "^1.64.0"
88
},
@@ -742,16 +742,16 @@
742742
]
743743
}
744744
},
745-
"main": "./out/main.js",
746-
"_main": "./out/extension.js",
745+
"_main": "./out/main.js",
746+
"main": "./out/extension.js",
747747
"scripts": {
748-
"vscode:prepublish": "npm run esbuild-base -- --minify",
748+
"_vscode:prepublish": "npm run esbuild-base -- --minify",
749749
"esbuild-base": "esbuild ./src/extension.ts --bundle --outfile=out/main.js --external:vscode --format=cjs --platform=node",
750750
"esbuild": "npm run esbuild-base -- --sourcemap",
751751
"esbuild-watch": "npm run esbuild-base -- --sourcemap --watch",
752752
"watch": "tsc -watch -p ./",
753753
"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",
754-
"_vscode:prepublish": "npm run compile",
754+
"vscode:prepublish": "npm run compile",
755755
"compile": "tsc -p ./",
756756
"pretest": "npm run compile && npm run lint",
757757
"lint": "eslint src --ext ts",

src/ViewBranches.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -314,7 +314,7 @@ export class TreeViewBranches implements vscode.TreeDataProvider<Flow> {
314314
return;
315315
}
316316
name = name.replace(/\s/igm, "_");
317-
const checked = this.util.execSync(`git check-ref-format --branch ${name}`).trim();
317+
const checked = this.util.execSync(`"${this.util.path}" check-ref-format --branch ${name}`).trim();
318318

319319
if (checked !== name) {
320320
vscode.window.showErrorMessage(`Error creating a branch: ${checked}`);

src/ViewVersions.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ export class TreeViewVersions implements vscode.TreeDataProvider<Tag> {
102102
let name = node?.label;
103103
if (node === undefined) {
104104
let tags = this.util
105-
.execSync("git tag --sort=-v:refname")
105+
.execSync(`"${this.util.path}" tag --sort=-v:refname`)
106106
.split("\n")
107107
.map((el) => el.trim())
108108
.filter((el) => el !== "");

0 commit comments

Comments
 (0)