deploy-vir 0.2.7 → 0.2.8
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/dist/git.js +5 -1
- package/package.json +1 -1
- package/src/git.ts +5 -0
package/dist/git.js
CHANGED
|
@@ -83,7 +83,11 @@ export async function pushDeploy(git, { deployName, fromBranch, toBranch }, remo
|
|
|
83
83
|
log.faint(` ${index + 1}. ${commit.hash.slice(0, 7)} (${commit.author_name}) - ${commit.message}`);
|
|
84
84
|
});
|
|
85
85
|
}
|
|
86
|
-
const shouldForcePush = await askQuestion(`\nDo you want to force push ${logColors.bold}${fromBranch}${logColors.reset} to ${logColors.bold}${toBranch}${logColors.reset}?\n\n${logColors.warning}This will overwrite the commits only on ${logColors.bold}${toBranch}${logColors.normalWeight}.${logColors.reset} (y/N):
|
|
86
|
+
const shouldForcePush = await askQuestion(`\nDo you want to force push ${logColors.bold}${fromBranch}${logColors.reset} to ${logColors.bold}${toBranch}${logColors.reset}?\n\n${logColors.warning}This will overwrite the commits only on ${logColors.bold}${toBranch}${logColors.normalWeight}.${logColors.reset} (y/N): `, {
|
|
87
|
+
timeout: {
|
|
88
|
+
hours: 2,
|
|
89
|
+
},
|
|
90
|
+
});
|
|
87
91
|
if (shouldForcePush.toLowerCase() === 'y' || shouldForcePush.toLowerCase() === 'yes') {
|
|
88
92
|
await git.push(remoteName, pushString, ['--force']);
|
|
89
93
|
log.warning(`Force pushed ${logColors.bold}${fromBranch}${logColors.reset} to ${logColors.bold}${toBranch}${logColors.reset}.`);
|
package/package.json
CHANGED
package/src/git.ts
CHANGED
|
@@ -175,6 +175,11 @@ export async function pushDeploy(
|
|
|
175
175
|
|
|
176
176
|
const shouldForcePush = await askQuestion(
|
|
177
177
|
`\nDo you want to force push ${logColors.bold}${fromBranch}${logColors.reset} to ${logColors.bold}${toBranch}${logColors.reset}?\n\n${logColors.warning}This will overwrite the commits only on ${logColors.bold}${toBranch}${logColors.normalWeight}.${logColors.reset} (y/N): `,
|
|
178
|
+
{
|
|
179
|
+
timeout: {
|
|
180
|
+
hours: 2,
|
|
181
|
+
},
|
|
182
|
+
},
|
|
178
183
|
);
|
|
179
184
|
|
|
180
185
|
if (shouldForcePush.toLowerCase() === 'y' || shouldForcePush.toLowerCase() === 'yes') {
|