cherrypick-interactive 1.14.10 → 1.14.11
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 +4 -9
- package/package.json +1 -1
package/cli.js
CHANGED
|
@@ -1602,14 +1602,8 @@ async function main() {
|
|
|
1602
1602
|
|
|
1603
1603
|
// Clean up temporary changelog file
|
|
1604
1604
|
if (argv['create-release']) {
|
|
1605
|
-
try {
|
|
1606
|
-
|
|
1607
|
-
log(chalk.gray('Cleaned up RELEASE_CHANGELOG.md'));
|
|
1608
|
-
} catch (e) {
|
|
1609
|
-
if (e.code !== 'ENOENT') {
|
|
1610
|
-
err(chalk.gray(`Could not remove RELEASE_CHANGELOG.md: ${e.message}`));
|
|
1611
|
-
}
|
|
1612
|
-
}
|
|
1605
|
+
try { await gitRaw(['checkout', 'HEAD', '--', 'RELEASE_CHANGELOG.md']); } catch {}
|
|
1606
|
+
try { await gitRaw(['clean', '-f', 'RELEASE_CHANGELOG.md']); } catch {}
|
|
1613
1607
|
}
|
|
1614
1608
|
|
|
1615
1609
|
const finalBranch = argv['create-release']
|
|
@@ -1643,7 +1637,8 @@ async function main() {
|
|
|
1643
1637
|
|
|
1644
1638
|
// Clean up session and temp files on error too
|
|
1645
1639
|
try { await deleteSession(); } catch { /* ignore cleanup errors */ }
|
|
1646
|
-
try { await
|
|
1640
|
+
try { await gitRaw(['checkout', 'HEAD', '--', 'RELEASE_CHANGELOG.md']); } catch {}
|
|
1641
|
+
try { await gitRaw(['clean', '-f', 'RELEASE_CHANGELOG.md']); } catch {}
|
|
1647
1642
|
|
|
1648
1643
|
// Output partial JSON result on error
|
|
1649
1644
|
if (isJsonFormat) {
|
package/package.json
CHANGED