cherrypick-interactive 1.14.7 → 1.14.9
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/cli.js +6 -1
- package/package.json +1 -1
package/cli.js
CHANGED
|
@@ -1600,6 +1600,11 @@ async function main() {
|
|
|
1600
1600
|
log(chalk.gray(`Pushed ${onBranch} with version bump.`));
|
|
1601
1601
|
}
|
|
1602
1602
|
|
|
1603
|
+
// Clean up temporary changelog file if it wasn't already removed
|
|
1604
|
+
if (argv['create-release']) {
|
|
1605
|
+
try { await fsPromises.unlink('RELEASE_CHANGELOG.md'); } catch {}
|
|
1606
|
+
}
|
|
1607
|
+
|
|
1603
1608
|
const finalBranch = argv['create-release']
|
|
1604
1609
|
? await gitRaw(['rev-parse', '--abbrev-ref', 'HEAD']) // should be release/*
|
|
1605
1610
|
: currentBranch;
|
|
@@ -1689,7 +1694,7 @@ async function ensureReleaseBranchFresh(branchName, startPoint) {
|
|
|
1689
1694
|
|
|
1690
1695
|
if (remoteExists) {
|
|
1691
1696
|
try {
|
|
1692
|
-
await gitRaw(['push', 'origin', '--delete', branchName]);
|
|
1697
|
+
await gitRaw(['push', 'origin', '--delete', branchName, '--no-verify']);
|
|
1693
1698
|
log(chalk.yellow(`↷ Deleted existing remote branch origin/${branchName}`));
|
|
1694
1699
|
} catch (e) {
|
|
1695
1700
|
err(chalk.red(`Failed to delete remote branch origin/${branchName}: ${e.message || e}`));
|
package/package.json
CHANGED