cherrypick-interactive 1.14.4 → 1.14.6
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 +9 -4
- package/package.json +1 -1
package/cli.js
CHANGED
|
@@ -1402,11 +1402,11 @@ async function main() {
|
|
|
1402
1402
|
{
|
|
1403
1403
|
type: 'list',
|
|
1404
1404
|
name: 'choice',
|
|
1405
|
-
message: 'How would you like to proceed?',
|
|
1405
|
+
message: 'Some selected commits depend on unselected commits (see above). How would you like to proceed?',
|
|
1406
1406
|
choices: [
|
|
1407
|
-
{ name: 'Include missing commits and continue', value: 'include' },
|
|
1408
|
-
{ name: 'Go back to selection', value: 'back' },
|
|
1409
|
-
{ name: '
|
|
1407
|
+
{ name: 'Include missing dependency commits and continue', value: 'include' },
|
|
1408
|
+
{ name: 'Go back to commit selection', value: 'back' },
|
|
1409
|
+
{ name: 'Skip dependencies and continue anyway (may cause conflicts)', value: 'continue' },
|
|
1410
1410
|
],
|
|
1411
1411
|
},
|
|
1412
1412
|
]);
|
|
@@ -1621,6 +1621,11 @@ async function main() {
|
|
|
1621
1621
|
await deleteSession();
|
|
1622
1622
|
|
|
1623
1623
|
log(chalk.green(`\n✅ Done on ${finalBranch}`));
|
|
1624
|
+
|
|
1625
|
+
// Allow process to exit naturally. stdin.ref() may have been called
|
|
1626
|
+
// after ink unmount to keep inquirer prompts working; unref it now
|
|
1627
|
+
// so the event loop can drain.
|
|
1628
|
+
process.stdin.unref();
|
|
1624
1629
|
} catch (e) {
|
|
1625
1630
|
err(chalk.red(`\n❌ Error: ${e.message || e}`));
|
|
1626
1631
|
|
package/package.json
CHANGED