Skip to content

Only quote commit messages if bumping in windows command prompt #10581

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
riknoll merged 3 commits into from
May 12, 2025
Merged

Only quote commit messages if bumping in windows command prompt #10581

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1c25d8a
remove the double quoting of commit messages in bump command
riknoll May 12, 2025
cf75f47
Merge branch 'master' into dev/riknoll/remove-double-quoting
riknoll May 12, 2025
29872e9
check in win32 before quoting
riknoll May 12, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 9 additions & 2 deletions cli/nodeutil.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -284,7 +284,7 @@ export async function npmVersionBumpAsync(
): Promise<string> {
const output = await spawnWithPipeAsync({
cmd: addCmd("npm"),
args: ["version", bumpType, "--message", `"[pxt-cli] bump version to %s"`, "--git-tag-version", tagCommit ? "true" : "false"],
args: ["version", bumpType, "--message", quoteIfNeeded(`[pxt-cli] bump version to %s`), "--git-tag-version", tagCommit ? "true" : "false"],
cwd: ".",
silent: true,
});
Expand All @@ -299,14 +299,21 @@ export async function npmVersionBumpAsync(
});
await spawnAsync({
cmd: "git",
args: ["commit", "-m", `"[pxt-cli] bump version to ${ver}"`],
args: ["commit", "-m", quoteIfNeeded(`[pxt-cli] bump version to ${ver}`)],
cwd: ".",
silent: true,
});
}
return ver;
}

function quoteIfNeeded(arg: string) {
if (os.platform() === "win32") {
return `"${arg}"`;
}
return arg;
}

export function gitPushAsync(followTags: boolean = true) {
const args = ["push"];
if (followTags) args.push("--follow-tags");
Expand Down